diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2023-01-24 16:49:41 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2023-02-01 13:48:22 +0000 |
| commit | 4d6827dde9248b6b47949b535ae361e8c6b04cfa (patch) | |
| tree | 8f84c51ee000d05fcfede7f47e10ed5d85b6853c | |
| parent | 17b28909a99cce2dc908ad2ffbb43a85539fa526 (diff) | |
| download | qt-creator-4d6827dde9248b6b47949b535ae361e8c6b04cfa.tar.gz | |
Utils: Tr::tr
Change-Id: Ic03e20993f05fb5b49a12c891d86afb2c8e18e08
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
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; } </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Dialog</source> <translation type="obsolete">Dialog</translation> @@ -14776,9 +14776,6 @@ p, li { white-space: pre-wrap; } <source>Do not &ask again</source> <translation>&Neptat se znovu</translation> </message> -</context> -<context> - <name>Utils::WizardPage</name> <message> <source>Choose the location</source> <translation type="obsolete">Vybrat umístění</translation> @@ -14795,9 +14792,6 @@ p, li { white-space: pre-wrap; } <source>Choose the Location</source> <translation>Vybrat umístění</translation> </message> -</context> -<context> - <name>Utils::NewClassWidget</name> <message> <source>Class name:</source> <translation type="obsolete">Název třídy:</translation> @@ -14902,18 +14896,11 @@ p, li { white-space: pre-wrap; } <source>Inherits QQuickItem - Qt Quick 2</source> <translation>Dědí ze třídy QQuickItem - Qt Quick 2</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source>Introduction and project location</source> <translation type="obsolete">Uvedení a umístění projektu</translation> </message> <message> - <source>Name:</source> - <translation>Název:</translation> - </message> - <message> <source>Create in:</source> <translation>Vytvořit v:</translation> </message> @@ -14941,9 +14928,6 @@ p, li { white-space: pre-wrap; } <source>Project:</source> <translation>Projekt:</translation> </message> -</context> -<context> - <name>Utils::SubmitEditorWidget</name> <message> <source>Subversion Submit</source> <translation type="obsolete">Odeslání Subversion</translation> @@ -16194,7 +16178,7 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás </message> </context> <context> - <name>Utils::ClassNameValidatingLineEdit</name> + <name>::Utils</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>Název třídy nesmí obsahovat znaky pro oddělení jmenného prostoru.</translation> @@ -16207,9 +16191,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás <source>The class name contains invalid characters.</source> <translation>Název třídy obsahuje neplatné znaky.</translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation>Nepodařilo se zřídit spojovací kanál: %1</translation> @@ -16286,9 +16267,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás <source>Cannot obtain exit status from inferior: %1</source> <translation>Nepodařilo se získat vrácenou hodnotu z podřízeného: %1</translation> </message> -</context> -<context> - <name>Utils::DetailsButton</name> <message> <source>Show Details</source> <translation type="obsolete">Ukázat podrobnosti</translation> @@ -16297,9 +16275,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás <source>Details</source> <translation>Podrobnosti</translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> <message> <source>The name must not be empty</source> <translation type="obsolete">Název nesmí být prázdný</translation> @@ -16344,9 +16319,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás <source>File extensions %1 are required:</source> <translation>Je požadována jedna ze souborových přípon %1:</translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -16371,9 +16343,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás <numerusform>%1: %n výskyty ve %2 ze %3 souborů.</numerusform> </translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>Vybrat...</translation> @@ -16451,13 +16420,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás <translation type="obsolete">Cesta '%1' neukazuje na soubor.</translation> </message> <message> - <source>Path:</source> - <translation>Cesta:</translation> - </message> -</context> -<context> - <name>Utils::PathListEditor</name> - <message> <source>Insert...</source> <translation>Vložit...</translation> </message> @@ -16481,9 +16443,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás <source>From "%1"</source> <translation>Z "%1"</translation> </message> -</context> -<context> - <name>Utils::ProjectNameValidatingLineEdit</name> <message> <source>The name must not contain the '.'-character.</source> <translation type="obsolete">Název nesmí obsahovat znak '.'.</translation> @@ -16496,9 +16455,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás <source>Invalid character '.'.</source> <translation>Neplatný znak '.'.</translation> </message> -</context> -<context> - <name>Utils::reloadPrompt</name> <message> <source>File Changed</source> <translation>Soubor byl změněn</translation> @@ -21586,7 +21542,7 @@ Pro projekty qmlproject použijte vlastnost importPaths pro přidání zaváděc </message> </context> <context> - <name>Utils::FancyMainWindow</name> + <name>::Utils</name> <message> <source>Locked</source> <translation>Ukotveno</translation> @@ -21595,16 +21551,10 @@ Pro projekty qmlproject použijte vlastnost importPaths pro přidání zaváděc <source>Reset to Default Layout</source> <translation>Nastavit znovu výchozí rozvržení</translation> </message> -</context> -<context> - <name>Utils::FileWizardDialog</name> <message> <source>Location</source> <translation>Umístění</translation> </message> -</context> -<context> - <name>Utils::FilterLineEdit</name> <message> <source>Filter</source> <translation>Filtr</translation> @@ -21613,9 +21563,6 @@ Pro projekty qmlproject použijte vlastnost importPaths pro přidání zaváděc <source>Clear text</source> <translation>Smazat text</translation> </message> -</context> -<context> - <name>Utils::fileDeletedPrompt</name> <message> <source>File has been removed</source> <translation>Soubor byl odstraněn</translation> @@ -21656,16 +21603,10 @@ Pro projekty qmlproject použijte vlastnost importPaths pro přidání zaváděc <source>Save</source> <translation type="obsolete">Uložit</translation> </message> -</context> -<context> - <name>Utils::UnixTools</name> <message> <source><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></source> <translation><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></translation> </message> -</context> -<context> - <name>Utils::LinearProgressWidget</name> <message> <source>...</source> <translation>...</translation> @@ -29268,7 +29209,7 @@ With cache simulation, further event counters are enabled: </message> </context> <context> - <name>Utils::DebuggerLanguageChooser</name> + <name>::Utils</name> <message> <source>C++</source> <translation type="obsolete">C++</translation> @@ -29285,9 +29226,6 @@ With cache simulation, further event counters are enabled: <source><a href="qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html">What are the prerequisites?</a></source> <translation type="obsolete"><a href="qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html">Jaké jsou předpoklady?</a></translation> </message> -</context> -<context> - <name>Utils::EnvironmentModel</name> <message> <source><UNSET></source> <translation><NENÍ NASTAVENO></translation> @@ -29310,9 +29248,6 @@ With cache simulation, further event counters are enabled: <extracomment>Value when inserting a new variable</extracomment> <translation><HODNOTA></translation> </message> -</context> -<context> - <name>Utils::FileUtils</name> <message> <source>Refusing to remove root directory.</source> <translation>Kořenový adresář nelze odstranit..</translation> @@ -29365,23 +29300,14 @@ With cache simulation, further event counters are enabled: <source>Cannot create temporary file in %1: %2</source> <translation>Nepodařilo se vytvořit žádný dočasný soubor v %1: %2</translation> </message> -</context> -<context> - <name>Utils::IpAddressLineEdit</name> <message> <source>The IP address is not valid.</source> <translation>IP adresa je neplatná.</translation> </message> -</context> -<context> - <name>Utils::QtcProcess</name> <message> <source>Error in command line.</source> <translation>Chyba v příkazovém řádku.</translation> </message> -</context> -<context> - <name>Utils::Internal::SftpChannelPrivate</name> <message> <source>Server could not start sftp subsystem.</source> <translation type="obsolete">Server se nepodařilo spustit subsystém sftp.</translation> @@ -29477,14 +29403,11 @@ Server: %2.</translation> </message> </context> <context> - <name>Utils::Internal::SshChannelManager</name> + <name>::Utils</name> <message> <source>Invalid channel id %1</source> <translation type="obsolete">Neplatný identifikátor kanálu %1</translation> </message> -</context> -<context> - <name>Utils::Internal::SshConnectionPrivate</name> <message> <source>SSH Protocol error: %1</source> <translation type="obsolete">Chyba v protokolu SSH: %1</translation> @@ -29502,10 +29425,6 @@ Server: %2.</translation> <translation type="obsolete">Neplatný identifikátor serveru '%1'.</translation> </message> <message> - <source>Unexpected packet of type %1.</source> - <translation type="obsolete">Neočekávaný paket typu %1.</translation> - </message> - <message> <source>Private key error: %1</source> <translation type="obsolete">Chyba v soukromém klíči: %1</translation> </message> @@ -29545,9 +29464,6 @@ Server: %2.</translation> <source>Private key file error: %1</source> <translation type="obsolete">Chyba v soukromém klíči: %1</translation> </message> -</context> -<context> - <name>Utils::SynchronousProcess</name> <message> <source>The command '%1' finished successfully.</source> <translation>Příkaz '%1' byl ukončen úspěšně.</translation> @@ -38167,7 +38083,7 @@ Prověřte, prosím, oprávnění pro přístup k adresáři.</translation> </message> </context> <context> - <name>Utils::Ssh</name> + <name>::Utils</name> <message> <source>Password Required</source> <translation type="obsolete">Heslo vyžadováno</translation> @@ -38176,9 +38092,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři.</translation> <source>Please enter the password for your private key.</source> <translation type="obsolete">Zadejte, prosím, heslo pro svůj soukromý klíč.</translation> </message> -</context> -<context> - <name>Utils::TextFileFormat</name> <message> <source>Out of memory.</source> <translation>Není dostupná žádná další paměť.</translation> @@ -39293,7 +39206,7 @@ Filtr: %2 </message> </context> <context> - <name>Utils::SshKeyCreationDialog</name> + <name>::Utils</name> <message> <source>SSH Key Configuration</source> <translation type="obsolete">Nastavení klíče SSH</translation> @@ -42392,14 +42305,11 @@ Jméno <E-mail> alias <E-mail>.</translation> </message> </context> <context> - <name>Utils::BaseTreeView</name> + <name>::Utils</name> <message> <source>Adjust Column Widths to Contents</source> <translation>Přizpůsobit šířku sloupců obsahu</translation> </message> -</context> -<context> - <name>Utils::SettingsSelector</name> <message> <source>Add</source> <translation>Přidat</translation> @@ -42424,9 +42334,6 @@ Jméno <E-mail> alias <E-mail>.</translation> <source>Rename...</source> <translation>Přejmenovat...</translation> </message> -</context> -<context> - <name>Utils::SftpFileSystemModel</name> <message> <source>File Type</source> <translation type="obsolete">Typ souboru</translation> @@ -42443,9 +42350,6 @@ Jméno <E-mail> alias <E-mail>.</translation> <source>Error listing contents of directory '%1': %2</source> <translation type="obsolete">Chyba při vypisování obsahu adresáře '%1': %2</translation> </message> -</context> -<context> - <name>Utils::Internal::SshRemoteProcessPrivate</name> <message> <source>Process killed by signal</source> <translation type="obsolete">Proces ukončen signálem</translation> @@ -46006,7 +45910,7 @@ Je zapotřebí mít nějakou verzi Qt a sadu nástrojů, aby modely kódu C++ a </message> </context> <context> - <name>Utils::ElfReader</name> + <name>::Utils</name> <message> <source>'%1' is an invalid ELF object (%2)</source> <translation>'%1' je neplatným objektem ELF (%2)</translation> @@ -51634,7 +51538,7 @@ Lze používat části jmen, pokud jsou jednoznačné.</translation> </message> </context> <context> - <name>QmlJS::QrcParser</name> + <name>::Utils</name> <message> <source>XML error on line %1, col %2: %3</source> <translation>Chyba v XML na řádku %1, sloupec %2: %3</translation> @@ -52294,7 +52198,7 @@ Lze používat části jmen, pokud jsou jednoznačné.</translation> </message> </context> <context> - <name>Diff</name> + <name>::Utils</name> <message> <source>Delete</source> <translation>Smazat</translation> @@ -55570,15 +55474,7 @@ Vytvořte, prosím, aplikaci qmldump na stránce pro nastavení verze Qt.</trans </message> </context> <context> - <name>Utils::FancyLineEdit</name> - <message> - <source>Filter</source> - <translation>Filtr</translation> - </message> - <message> - <source>Clear text</source> - <translation>Smazat text</translation> - </message> + <name>::Utils</name> </context> <context> <name>::Android</name> 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.</translation> </message> </context> <context> - <name>Diff</name> + <name>::Utils</name> <message> <source>Delete</source> <translation>Slet</translation> @@ -28844,7 +28844,7 @@ Byg venligst qmldump-programmet på valgmulighedersiden Qt version.</translation </message> </context> <context> - <name>QmlJS::QrcParser</name> + <name>::Utils</name> <message> <source>XML error on line %1, col %2: %3</source> <translation>XML-fejl på linje %1, kolonne %2: %3</translation> @@ -36276,7 +36276,7 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Do not ask again</source> <translation>Spørg ikke igen</translation> @@ -36289,9 +36289,6 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> <source>Do not &show again</source> <translation>&Vis ikke igen</translation> </message> -</context> -<context> - <name>Utils::ClassNameValidatingLineEdit</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>Klassenavnet må ikke indeholde navnerum-afgrænsere.</translation> @@ -36304,9 +36301,6 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> <source>The class name contains invalid characters.</source> <translation>Klassenavnet indeholder ugyldige tegn.</translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation>Kan ikke opsætte kommunikationskanal: %1</translation> @@ -36375,9 +36369,6 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> <source>Cannot obtain exit status from inferior: %1</source> <translation>Kan ikke få fat i exit-status fra den laverestående: %1</translation> </message> -</context> -<context> - <name>Utils::DebuggerMainWindow</name> <message> <source>&Views</source> <translation>&Visninger</translation> @@ -36402,16 +36393,10 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> <source>Stop</source> <translation>Stop</translation> </message> -</context> -<context> - <name>Utils::DetailsButton</name> <message> <source>Details</source> <translation>Detaljer</translation> </message> -</context> -<context> - <name>Utils::ElfReader</name> <message> <source>"%1" is an invalid ELF object (%2)</source> <translation>"%1" er et ugyldigt ELF-objekt (%2)</translation> @@ -36455,9 +36440,6 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> <source>section name %1 of %2 behind end of file</source> <translation>sektionsnavn %1 af %2 efter filens slutning</translation> </message> -</context> -<context> - <name>Utils::EnvironmentDialog</name> <message> <source>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.</translation> <source>Edit Environment</source> <translation>Rediger miljø</translation> </message> -</context> -<context> - <name>Utils::EnvironmentModel</name> <message> <source><UNSET></source> <translation><AFSÆT></translation> @@ -36497,9 +36476,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <extracomment>Value when inserting a new variable</extracomment> <translation><VÆRDI></translation> </message> -</context> -<context> - <name>Utils::FancyLineEdit</name> <message> <source>Filter</source> <translation>Filter</translation> @@ -36508,9 +36484,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Clear text</source> <translation>Ryd tekst</translation> </message> -</context> -<context> - <name>Utils::FancyMainWindow</name> <message> <source>Central Widget</source> <translation>Central-widget</translation> @@ -36523,9 +36496,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Automatically Hide View Title Bars</source> <translation>Skjul automatisk visningernes titellinjer</translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> <message> <source>Name is empty.</source> <translation>Navn er tomt.</translation> @@ -36554,16 +36524,10 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>File extensions %1 are required:</source> <translation>Filendelser %1 er krævet:</translation> </message> -</context> -<context> - <name>Utils::FileSaverBase</name> <message> <source>File Error</source> <translation>Filfejl</translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -36590,9 +36554,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>List of comma separated wildcard filters. Files with file name or full file path matching any filter are included.</source> <translation>Liste med kommasepareret jokertegnsfiltre. Filer med filnavn eller fuld filsti som matcher filter inkluderes.</translation> </message> -</context> -<context> - <name>Utils::FileUtils</name> <message> <source>Refusing to remove root directory.</source> <translation>Nægter at fjerne rodmappe.</translation> @@ -36626,10 +36587,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <translation>Kan ikke læse %1: %2</translation> </message> <message> - <source>File Error</source> - <translation>Filfejl</translation> - </message> - <message> <source>Cannot write file %1: %2</source> <translation>Kan ikke skrive filen %1: %2</translation> </message> @@ -36653,30 +36610,18 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Cannot create temporary file in %1: %2</source> <translation>Kan ikke oprette midlertidig fil i %1: %2</translation> </message> -</context> -<context> - <name>Utils::FileWizardPage</name> <message> <source>Location</source> <translation>Placering</translation> </message> -</context> -<context> - <name>Utils::HostOsInfo</name> <message> <source>Cannot create OpenGL context.</source> <translation>Kan ikke oprette OpenGL-kontekst.</translation> </message> -</context> -<context> - <name>Utils::LinearProgressWidget</name> <message> <source>...</source> <translation>...</translation> </message> -</context> -<context> - <name>Utils::MacroExpander</name> <message> <source>Infinite recursion error</source> <translation>Uendelig rekursiv fejl</translation> @@ -36713,9 +36658,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Access environment variables.</source> <translation>Tilgå miljøvariabler.</translation> </message> -</context> -<context> - <name>Utils::NewClassWidget</name> <message> <source>&Class name:</source> <translation>&Klassenavn:</translation> @@ -36788,9 +36730,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Invalid form file name: "%1"</source> <translation>Ugyldigt udformningsfilnavn: "%1"</translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>Vælg...</translation> @@ -36851,9 +36790,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Path:</source> <translation>Sti:</translation> </message> -</context> -<context> - <name>Utils::PathListEditor</name> <message> <source>Insert...</source> <translation>Indsæt...</translation> @@ -36866,9 +36802,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Clear</source> <translation>Ryd</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source>Introduction and Project Location</source> <translation>Introduktion og projektplacering</translation> @@ -36894,10 +36827,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <translation>Indtast projektnavn</translation> </message> <message> - <source>Location</source> - <translation>Placering</translation> - </message> - <message> <source>The project already exists.</source> <translation>Projektet findes allerede.</translation> </message> @@ -36906,10 +36835,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <translation>En fil med det navn findes allerede.</translation> </message> <message> - <source>Name is empty.</source> - <translation>Navn er tomt.</translation> - </message> - <message> <source>Name does not match "%1".</source> <translation>Navn matcher ikke "%1".</translation> </message> @@ -36921,9 +36846,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Invalid character "%1" found.</source> <translation>Ugyldigt tegn "%1" fundet.</translation> </message> -</context> -<context> - <name>Utils::ProxyCredentialsDialog</name> <message> <source>Proxy Credentials</source> <translation>Proxy-legitimationsoplysninger</translation> @@ -36948,16 +36870,10 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Password</source> <translation>Adgangskode</translation> </message> -</context> -<context> - <name>Utils::QtcProcess</name> <message> <source>Error in command line.</source> <translation>Fejl i kommandolinje.</translation> </message> -</context> -<context> - <name>Utils::SettingsAccessor</name> <message> <source>Failed to Read File</source> <translation>Kunne ikke læse fil</translation> @@ -37002,9 +36918,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>"%1" is not supported by %1. Do you want to try loading it anyway?</source> <translation>"%1" understøttes ikke af %1. Vil du prøve at indlæse den alligevel?</translation> </message> -</context> -<context> - <name>Utils::SettingsSelector</name> <message> <source>Add</source> <translation>Tilføj</translation> @@ -37029,9 +36942,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Rename...</source> <translation>Omdøb...</translation> </message> -</context> -<context> - <name>Utils::ShellCommand</name> <message> <source>UNKNOWN</source> <translation>UKENDT</translation> @@ -37040,9 +36950,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Unknown</source> <translation>Ukendt</translation> </message> -</context> -<context> - <name>Utils::ShellCommandPage</name> <message> <source>Command started...</source> <translation>Kommando startet...</translation> @@ -37063,9 +36970,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Failed.</source> <translation>Mislykkedes.</translation> </message> -</context> -<context> - <name>Utils::SynchronousProcess</name> <message> <source>The command "%1" finished successfully.</source> <translation>Kommandoen "%1" afsluttede med succes.</translation> @@ -37102,9 +37006,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>Would you like to terminate it?</source> <translation>Vil du terminere den?</translation> </message> -</context> -<context> - <name>Utils::TextFileFormat</name> <message> <source>Out of memory.</source> <translation>Ikke mere ledig hukommelse.</translation> @@ -37113,32 +37014,15 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>An encoding error was encountered.</source> <translation>Stødte på en kodningsfejl.</translation> </message> -</context> -<context> - <name>Utils::UnixTools</name> <message> <source><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></source> <translation><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></translation> </message> -</context> -<context> - <name>Utils::WizardPage</name> <message> <source>Choose the Location</source> <translation>Vælg placeringen</translation> </message> <message> - <source>Name:</source> - <translation>Navn:</translation> - </message> - <message> - <source>Path:</source> - <translation>Sti:</translation> - </message> -</context> -<context> - <name>Utils::fileDeletedPrompt</name> - <message> <source>File Has Been Removed</source> <translation>Filen er blevet fjernet</translation> </message> @@ -37162,9 +37046,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <source>&Save</source> <translation>&Gem</translation> </message> -</context> -<context> - <name>Utils::reloadPrompt</name> <message> <source>File Changed</source> <translation>Fil ændret</translation> @@ -37178,10 +37059,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel.</translation> <translation>Filen <i>%1</i> er blevet ændret på disk. Vil du genindlæse den?</translation> </message> <message> - <source>&Close</source> - <translation>&Luk</translation> - </message> - <message> <source>No to All && &Diff</source> <translation>Nej til alle og &diff</translation> </message> @@ -39597,7 +39474,7 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o </message> </context> <context> - <name>Utils::RemoveFileDialog</name> + <name>::Utils</name> <message> <source>Remove File</source> <translation>Fjern fil</translation> @@ -39859,7 +39736,7 @@ Spordataene er tabt.</translation> </message> </context> <context> - <name>Utils::EnvironmentIdAccessor</name> + <name>::Utils</name> <message> <source>Settings File for "%1" from a Different Environment?</source> <translation>Indstillingsfil for "%1" fra et andet miljø?</translation> 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 </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Do not ask again</source> <translation>Nicht noch einmal nachfragen</translation> @@ -12126,9 +12126,6 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun <source>Do not &show again</source> <translation>Nicht noch einmal an&zeigen</translation> </message> -</context> -<context> - <name>Utils::ClassNameValidatingLineEdit</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>Der Klassenname darf keine Namensraum-Trenner enthalten.</translation> @@ -12141,16 +12138,10 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun <source>The class name contains invalid characters.</source> <translation>Der Klassennamen enthält ungültige Zeichen.</translation> </message> -</context> -<context> - <name>Utils::DetailsButton</name> <message> <source>Details</source> <translation>Details</translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -12177,9 +12168,6 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun <source>List of comma separated wildcard filters. Files with file name or full file path matching any filter are included.</source> <translation>Kommaseparierte Liste von Platzhalter-Filtern. Dateien werden eingeschlossen, wenn ihr Name oder vollständiger Pfad einem der Filter entspricht.</translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>Auswählen...</translation> @@ -12244,9 +12232,6 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun <source>Path:</source> <translation>Pfad:</translation> </message> -</context> -<context> - <name>Utils::PathListEditor</name> <message> <source>Insert...</source> <translation>Einfügen...</translation> @@ -12259,18 +12244,11 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun <source>Clear</source> <translation>Löschen</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source>Enter project name</source> <translation>Geben Sie einen Namen für das Projekt ein</translation> </message> <message> - <source>Location</source> - <translation>Pfad</translation> - </message> - <message> <source>The project already exists.</source> <translation>Das Projekt existiert bereits.</translation> </message> @@ -12310,9 +12288,6 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun <source>Introduction and Project Location</source> <translation>Einführung und Projektverzeichnis</translation> </message> -</context> -<context> - <name>Utils::reloadPrompt</name> <message> <source>File Changed</source> <translation>Datei geändert</translation> @@ -13059,7 +13034,7 @@ Was möchten Sie tun?</translation> </message> </context> <context> - <name>Utils::UnixTools</name> + <name>::Utils</name> <message> <source><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></source> <translation><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></translation> @@ -14827,7 +14802,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins: </message> </context> <context> - <name>Utils::fileDeletedPrompt</name> + <name>::Utils</name> <message> <source>File Has Been Removed</source> <translation>Die Datei wurde gelöscht</translation> @@ -14837,10 +14812,6 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins: <translation>Die Datei %1 wurde vom Speichermedium gelöscht. Möchten Sie sie unter einem anderen Namen speichern oder den Editor schließen?</translation> </message> <message> - <source>&Close</source> - <translation>&Schließen</translation> - </message> - <message> <source>C&lose All</source> <translation>A&lle schließen</translation> </message> @@ -15052,7 +15023,7 @@ Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMa </message> </context> <context> - <name>Utils::LinearProgressWidget</name> + <name>::Utils</name> <message> <source>...</source> <translation>...</translation> @@ -15149,7 +15120,7 @@ Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMa </message> </context> <context> - <name>Utils::FancyMainWindow</name> + <name>::Utils</name> <message> <source>Central Widget</source> <translation>Zentrales Widget</translation> @@ -15928,11 +15899,7 @@ Möchten Sie sie überschreiben?</translation> </message> </context> <context> - <name>Utils::FileNameValidatingLineEdit</name> - <message> - <source>Name is empty.</source> - <translation>Der Dateiname ist leer.</translation> - </message> + <name>::Utils</name> <message> <source>Name contains white space.</source> <translation>Der Name enthält Leerzeichen.</translation> @@ -16170,14 +16137,7 @@ Möchten Sie sie überschreiben?</translation> </message> </context> <context> - <name>Utils::EnvironmentModel</name> - <message> - <source><VARIABLE></source> - <translation><Variable></translation> - </message> -</context> -<context> - <name>Utils::QtcProcess</name> + <name>::Utils</name> <message> <source>Error in command line.</source> <translation>Fehler in Kommandozeile.</translation> @@ -19728,7 +19688,7 @@ Speichern fehlgeschlagen.</translation> </message> </context> <context> - <name>Utils::FileUtils</name> + <name>::Utils</name> <message> <source>Refusing to remove root directory.</source> <translation>Das Wurzelverzeichnis kann nicht entfernt werden.</translation> @@ -20836,7 +20796,7 @@ When disabled, moves targets straight to the current mouse position.</source> </message> </context> <context> - <name>Utils::TextFileFormat</name> + <name>::Utils</name> <message> <source>Out of memory.</source> <translation>Es ist kein Speicher mehr verfügbar.</translation> @@ -22534,7 +22494,7 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen. </message> </context> <context> - <name>Utils::SettingsSelector</name> + <name>::Utils</name> <message> <source>Add</source> <translation>Hinzufügen</translation> @@ -25194,7 +25154,7 @@ wirklich löschen?</translation> </message> </context> <context> - <name>Utils::ElfReader</name> + <name>::Utils</name> <message> <source>"%1" is an invalid ELF object (%2)</source> <translation>"%1" ist keine gültige ELF-Objektdatei (%2)</translation> @@ -27716,7 +27676,7 @@ The affected files are: </message> </context> <context> - <name>Diff</name> + <name>::Utils</name> <message> <source>Delete</source> <translation>Löschen</translation> @@ -28142,7 +28102,7 @@ The affected files are: </message> </context> <context> - <name>QmlJS::QrcParser</name> + <name>::Utils</name> <message> <source>XML error on line %1, col %2: %3</source> <translation>XML-Fehler in Zeile %1, Spalte %2: %3</translation> @@ -30313,7 +30273,7 @@ Bitte erstellen Sie die Anwendung qmldump auf der Einstellungsseite der Qt-Versi </message> </context> <context> - <name>Utils::FancyLineEdit</name> + <name>::Utils</name> <message> <source>Filter</source> <translation>Filter</translation> @@ -30779,7 +30739,7 @@ Möchten Sie es beenden?</translation> </message> </context> <context> - <name>Utils::ProxyCredentialsDialog</name> + <name>::Utils</name> <message> <source>Proxy Credentials</source> <translation>Proxy-Nutzerdaten</translation> @@ -30878,7 +30838,7 @@ Möchten Sie es beenden?</translation> </message> </context> <context> - <name>Utils::FileWizardPage</name> + <name>::Utils</name> <message> <source>Choose the Location</source> <translation>Pfadangabe</translation> @@ -30888,10 +30848,6 @@ Möchten Sie es beenden?</translation> <translation>Dateiname:</translation> </message> <message> - <source>Path:</source> - <translation>Pfad:</translation> - </message> - <message> <source>Location</source> <translation>Ort</translation> </message> @@ -31043,7 +30999,7 @@ Möchten Sie es beenden?</translation> </message> </context> <context> - <name>Utils::SettingsAccessor</name> + <name>::Utils</name> <message> <source>Failed to Read File</source> <translation>Datei konnte nicht gelesen werden</translation> @@ -31330,7 +31286,7 @@ Möchten Sie es beenden?</translation> </message> </context> <context> - <name>Utils::MacroExpander</name> + <name>::Utils</name> <message> <source>Infinite recursion error</source> <translation>Fehler: Endlose Rekursion</translation> @@ -34570,7 +34526,7 @@ provided they were unmodified before the refactoring.</source> </message> </context> <context> - <name>Utils::HostOsInfo</name> + <name>::Utils</name> <message> <source>Cannot create OpenGL context.</source> <translation>OpenGL-Kontext kann nicht erzeugt werden.</translation> @@ -37628,7 +37584,7 @@ Siehe auch die Einstellungen für Google Test.</translation> </message> </context> <context> - <name>Utils::DebuggerMainWindow</name> + <name>::Utils</name> <message> <source>Start</source> <translation>Starten</translation> @@ -38193,7 +38149,7 @@ Drücken Sie zusätzlich die Umschalttaste, wird ein Escape-Zeichen an der aktue </message> </context> <context> - <name>Utils::EnvironmentDialog</name> + <name>::Utils</name> <message> <source>Edit Environment</source> <translation>Umgebung bearbeiten</translation> @@ -39491,11 +39447,7 @@ Zeile: %4, Spalte: %5 </message> </context> <context> - <name>Utils::FileSaverBase</name> - <message> - <source>File Error</source> - <translation>Dateifehler</translation> - </message> + <name>::Utils</name> </context> <context> <name>::Core</name> @@ -40716,7 +40668,7 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten.</translation> </message> </context> <context> - <name>Utils::RemoveFileDialog</name> + <name>::Utils</name> <message> <source>Remove File</source> <translation>Datei entfernen</translation> @@ -40758,7 +40710,7 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten.</translation> </message> </context> <context> - <name>Utils::EnvironmentIdAccessor</name> + <name>::Utils</name> <message> <source>Settings File for "%1" from a Different Environment?</source> <translation>Einstellungsdatei für "%1" aus anderer Umgebung?</translation> @@ -42918,7 +42870,7 @@ You might find further explanations in the Application Output view.</source> </message> </context> <context> - <name>JsonTreeModelItem</name> + <name>::Utils</name> <message> <source>Null</source> <translation>Null</translation> @@ -44019,7 +43971,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation> </message> </context> <context> - <name>Utils::NameValueModel</name> + <name>::Utils</name> <message> <source><UNSET></source> <translation><NICHT GESETZT></translation> @@ -44042,9 +43994,6 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation> <extracomment>Value when inserting a new variable</extracomment> <translation><VALUE></translation> </message> -</context> -<context> - <name>StringUtils</name> <message> <source>Elapsed time: %1.</source> <translation>Verstrichene Zeit: %1.</translation> @@ -46414,7 +46363,7 @@ Useful if build directory is corrupted or when rebuilding with a newer version o </message> </context> <context> - <name>Utils::InfoBarDisplay</name> + <name>::Utils</name> <message> <source>&Show Details</source> <translation>&Details anzeigen</translation> @@ -50250,7 +50199,7 @@ the QML editor know about a likely URI.</source> </message> </context> <context> - <name>Utils::Archive</name> + <name>::Utils</name> <message> <source>File format not supported.</source> <translation>Dateiformat wird nicht unterstützt.</translation> @@ -50274,16 +50223,10 @@ in "%2" aus. </translation> </message> -</context> -<context> - <name>Utils::StringAspect</name> <message> <source>Reset</source> <translation>Zurücksetzen</translation> </message> -</context> -<context> - <name>Utils::TriStateAspect</name> <message> <source>Enable</source> <translation>Aktivieren</translation> @@ -50296,16 +50239,10 @@ in "%2" aus. <source>Leave at Default</source> <translation>Vorgabe beibehalten</translation> </message> -</context> -<context> - <name>Utils::BaseTreeView</name> <message> <source>Show %1 Column</source> <translation>Spalte %1 anzeigen</translation> </message> -</context> -<context> - <name>Utils::FileSystemModel</name> <message> <source>My Computer</source> <translation>Mein Computer</translation> @@ -50351,7 +50288,7 @@ in "%2" aus. </message> </context> <context> - <name>Utils::LauncherSocket</name> + <name>::Utils</name> <message> <source>Failed to start process launcher at "%1": %2</source> <translation>Prozess-Launcher "%1" konnte nicht gestartet werden: %2</translation> @@ -50376,23 +50313,14 @@ in "%2" aus. <source>Launcher socket closed unexpectedly.</source> <translation>Launcher-Socket wurde unerwartet geschlossen.</translation> </message> -</context> -<context> - <name>Utils::LauncherHandle</name> <message> <source>Process launcher socket error.</source> <translation>Prozess-Launcher Socketfehler.</translation> </message> -</context> -<context> - <name>Utils::MinimizableInfoBars</name> <message> <source>Minimize</source> <translation>Minimieren</translation> </message> -</context> -<context> - <name>Utils::NameValuesDialog</name> <message> <source>&OK</source> <translation>&OK</translation> @@ -50401,9 +50329,6 @@ in "%2" aus. <source>&Cancel</source> <translation>&Abbrechen</translation> </message> -</context> -<context> - <name>Utils::VariableChooser</name> <message> <source>Insert Variable</source> <translation>Variable einfügen</translation> 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?</source> </message> </context> <context> - <name>Utils::ClassNameValidatingLineEdit</name> + <name>::Utils</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>El nombre de clase no debe contener delimitadores de namespaces.</translation> @@ -1704,9 +1704,6 @@ Would you like to overwrite them?</source> <source>The class name contains invalid characters.</source> <translation>El nombre de clase contiene caracteres inválidos.</translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation>No se pudo establecer canal de comunicación: %1</translation> @@ -1755,9 +1752,6 @@ Would you like to overwrite them?</source> <source>Cannot obtain exit status from inferior: %1</source> <translation>No se pudo obtener el estado de salida del inferior: %1</translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> <message> <source>The name must not be empty</source> <translation>El nombre no puede dejarse vacío</translation> @@ -1774,9 +1768,6 @@ Would you like to overwrite them?</source> <source>The name must not match that of a MS Windows device. (%1).</source> <translation>El nombre no debe coincidir con el nombre de dispositivo de MS Windows. (%1).</translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -1798,9 +1789,6 @@ Would you like to overwrite them?</source> <numerusform>%1: %n coincidencias encontradas en %2 de %3 archivos.</numerusform> </translation> </message> -</context> -<context> - <name>Utils::NewClassWidget</name> <message> <source>Invalid base class name</source> <translation>Nombre de clase base inválido</translation> @@ -1851,9 +1839,6 @@ Would you like to overwrite them?</source> <source>Path:</source> <translation>Ruta:</translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>Elegir...</translation> @@ -1890,9 +1875,6 @@ Would you like to overwrite them?</source> <source>Path:</source> <translation>Ruta:</translation> </message> -</context> -<context> - <name>Utils::PathListEditor</name> <message> <source>Insert...</source> <translation>Insertar...</translation> @@ -1913,9 +1895,6 @@ Would you like to overwrite them?</source> <source>From "%1"</source> <translation>Desde "%1"</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source><Enter_Name></source> <translation><Introduzca_nombre></translation> @@ -1942,16 +1921,10 @@ Would you like to overwrite them?</source> <source>Create in:</source> <translation>Crear en:</translation> </message> -</context> -<context> - <name>Utils::ProjectNameValidatingLineEdit</name> <message> <source>The name must not contain the '.'-character.</source> <translation>El nombre no puede contener el caracter '.' (punto).</translation> </message> -</context> -<context> - <name>Utils::SubmitEditorWidget</name> <message> <source>Subversion Submit</source> <translation>Enviar a Subversion</translation> @@ -1966,27 +1939,11 @@ Would you like to overwrite them?</source> <source>F&iles</source> <translation>Arch&ivos</translation> </message> -</context> -<context> - <name>Utils::WizardPage</name> <message> <source>Choose the location</source> <translation>Seleccione ubicación</translation> </message> <message> - <location/> - <source>Name:</source> - <translation>Nombre:</translation> - </message> - <message> - <location/> - <source>Path:</source> - <translation>Ruta:</translation> - </message> -</context> -<context> - <name>Utils::reloadPrompt</name> - <message> <source>File Changed</source> <translation>El archivo fue modificado</translation> </message> @@ -10504,7 +10461,7 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Dialog</source> <translation type="unfinished"></translation> @@ -11414,7 +11371,7 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>Utils::DetailsButton</name> + <name>::Utils</name> <message> <source>Show Details</source> <translation type="unfinished"></translation> 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 ?</translation> </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Dialog</source> <translation type="obsolete">Boîte de dialogue</translation> @@ -1892,9 +1892,6 @@ Voulez vous les écraser ?</translation> <source>Do not &ask again</source> <translation>Ne plus &redemander</translation> </message> -</context> -<context> - <name>Utils::ClassNameValidatingLineEdit</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>Le nom de classe ne doit pas contenir de délimiteur d'espace de nommage.</translation> @@ -1907,9 +1904,6 @@ Voulez vous les écraser ?</translation> <source>The class name contains invalid characters.</source> <translation>Le nom de classe contient des caractères invalides.</translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation>Impossible d'établir le canal de communication : %1</translation> @@ -1986,9 +1980,6 @@ Voulez vous les écraser ?</translation> <source>Cannot obtain exit status from inferior: %1</source> <translation>Impossible d'obtenir la valeur de retour du processus : %1</translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> <message> <source>The name must not be empty</source> <translation type="obsolete">Le nom ne peut pas être vide</translation> @@ -2033,9 +2024,6 @@ Voulez vous les écraser ?</translation> <source>File extensions %1 are required:</source> <translation>Les extensions de fichier %1 sont nécessaires : </translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -2057,9 +2045,6 @@ Voulez vous les écraser ?</translation> <numerusform>%1 : %n occurences trouvés dans %2 de %3 fichiers.</numerusform> </translation> </message> -</context> -<context> - <name>Utils::NewClassWidget</name> <message> <source>Class name:</source> <translation type="obsolete">Nom de la classe :</translation> @@ -2085,10 +2070,6 @@ Voulez vous les écraser ?</translation> <translation type="obsolete">Fichier d'interface :</translation> </message> <message> - <source>Path:</source> - <translation type="obsolete">Chemin :</translation> - </message> - <message> <source>Invalid base class name</source> <translation>Nom de la classe parente invalide</translation> </message> @@ -2169,9 +2150,6 @@ Voulez vous les écraser ?</translation> <source>Inherits QQuickItem - Qt Quick 2</source> <translation>Hérite de QQuickItem - Qt Quick 2</translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>Choisir...</translation> @@ -2257,9 +2235,6 @@ Voulez vous les écraser ?</translation> <source>Path:</source> <translation>Chemin :</translation> </message> -</context> -<context> - <name>Utils::PathListEditor</name> <message> <source>Insert...</source> <translation>Insérer...</translation> @@ -2284,9 +2259,6 @@ Voulez vous les écraser ?</translation> <source>From "%1"</source> <translation>Depuis "%1"</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source>Introduction and project location</source> <translation type="obsolete">Introduction et emplacement du projet</translation> @@ -2323,9 +2295,6 @@ Voulez vous les écraser ?</translation> <source>Project:</source> <translation>Projet :</translation> </message> -</context> -<context> - <name>Utils::ProjectNameValidatingLineEdit</name> <message> <source>The name must not contain the '.'-character.</source> <translation type="obsolete">Le nom ne peut pas contenir le caractère '.'.</translation> @@ -2334,9 +2303,6 @@ Voulez vous les écraser ?</translation> <source>Invalid character '.'.</source> <translation>Caractère invalide '.'.</translation> </message> -</context> -<context> - <name>Utils::SubmitEditorWidget</name> <message> <source>Subversion Submit</source> <translation type="obsolete">Submit Subversion</translation> @@ -2394,28 +2360,14 @@ Voulez vous les écraser ?</translation> <source>Check a&ll</source> <translation type="obsolete">Coche&r tout</translation> </message> -</context> -<context> - <name>Utils::WizardPage</name> <message> <source>Choose the location</source> <translation type="obsolete">Choisir l'emplacement</translation> </message> <message> - <source>Name:</source> - <translation>Nom :</translation> - </message> - <message> - <source>Path:</source> - <translation>Chemin :</translation> - </message> - <message> <source>Choose the Location</source> <translation>Choisir l'emplacement</translation> </message> -</context> -<context> - <name>Utils::reloadPrompt</name> <message> <source>File Changed</source> <translation>Fichier modifié</translation> @@ -16104,7 +16056,7 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>Utils::DetailsButton</name> + <name>::Utils</name> <message> <source>Show Details</source> <translation type="obsolete">Afficher les détails</translation> @@ -20740,7 +20692,7 @@ Pour les projets qmlproject , utilisez la propriété importPaths pour ajouter l </message> </context> <context> - <name>Utils::FancyMainWindow</name> + <name>::Utils</name> <message> <source>Locked</source> <translation>Verrouillé</translation> @@ -20749,16 +20701,10 @@ Pour les projets qmlproject , utilisez la propriété importPaths pour ajouter l <source>Reset to Default Layout</source> <translation>Restaurer la disposition par défaut</translation> </message> -</context> -<context> - <name>Utils::FileWizardDialog</name> <message> <source>Location</source> <translation>Emplacement</translation> </message> -</context> -<context> - <name>Utils::FilterLineEdit</name> <message> <source>Filter</source> <translation>Filtre</translation> @@ -20767,9 +20713,6 @@ Pour les projets qmlproject , utilisez la propriété importPaths pour ajouter l <source>Clear text</source> <translation>Effacer le texte</translation> </message> -</context> -<context> - <name>Utils::fileDeletedPrompt</name> <message> <source>File has been removed</source> <translation>Le fichier a été supprimé</translation> @@ -20810,16 +20753,10 @@ Pour les projets qmlproject , utilisez la propriété importPaths pour ajouter l <source>Save</source> <translation type="obsolete">Enregistrer</translation> </message> -</context> -<context> - <name>Utils::UnixTools</name> <message> <source><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></source> <translation><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></translation> </message> -</context> -<context> - <name>Utils::LinearProgressWidget</name> <message> <source>...</source> <translation>...</translation> @@ -25258,7 +25195,7 @@ Preselects Qt for Simulator and mobile targets if available</source> </message> </context> <context> - <name>Utils::DebuggerLanguageChooser</name> + <name>::Utils</name> <message> <source>C++</source> <translation type="obsolete">C++</translation> @@ -25275,9 +25212,6 @@ Preselects Qt for Simulator and mobile targets if available</source> <source><a href="qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html">What are the prerequisites?</a></source> <translation type="obsolete"><a href="qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html">Quels sont les prérequis?</a></translation> </message> -</context> -<context> - <name>Utils::SynchronousProcess</name> <message> <source>The command '%1' finished successfully.</source> <translation>La commande "%1' s"est terminée avec succès.</translation> @@ -28886,14 +28820,11 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f </message> </context> <context> - <name>Utils::AbstractProcess</name> + <name>::Utils</name> <message> <source>Cannot retrieve debugging output.</source> <translation type="obsolete">Impossible d'obtenir la sortie du débogage.</translation> </message> -</context> -<context> - <name>Utils::EnvironmentModel</name> <message> <source><UNSET></source> <translation><NON-DÉFINI></translation> @@ -28916,23 +28847,14 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f <extracomment>Value when inserting a new variable</extracomment> <translation><VALEUR></translation> </message> -</context> -<context> - <name>Utils::IpAddressLineEdit</name> <message> <source>The IP address is not valid.</source> <translation>L'adresse IP est invalide.</translation> </message> -</context> -<context> - <name>Utils::QtcProcess</name> <message> <source>Error in command line.</source> <translation>Erreur dans la ligne de commande.</translation> </message> -</context> -<context> - <name>Utils::Internal::SftpChannelPrivate</name> <message> <source>Server could not start sftp subsystem.</source> <translation type="obsolete">Le serveur ne peut démarrer le sous-système sftp.</translation> @@ -29017,16 +28939,10 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f <source>Error reading local file: %1</source> <translation type="obsolete">Erreur lors de la lecture du fichier local : %1</translation> </message> -</context> -<context> - <name>Utils::Internal::SshChannelManager</name> <message> <source>Invalid channel id %1</source> <translation type="obsolete">Identifiant %1 du canal invalide</translation> </message> -</context> -<context> - <name>Utils::Internal::SshConnectionPrivate</name> <message> <source>SSH Protocol error: %1</source> <translation type="obsolete">Erreur dans le protocole SSH : %1</translation> @@ -29044,10 +28960,6 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f <translation type="obsolete">Identifiant de serveur invalide "%1".</translation> </message> <message> - <source>Unexpected packet of type %1.</source> - <translation type="obsolete">Paquet de type %1 inattendu.</translation> - </message> - <message> <source>Could not read private key file: %1</source> <translation type="obsolete">Impossible de lire le fichier de la clé privée : %1</translation> </message> @@ -33687,7 +33599,7 @@ Avec la simulation de cache, d'autres compteurs d'événements sont ac </message> </context> <context> - <name>Utils::FileUtils</name> + <name>::Utils</name> <message> <source>Refusing to remove root directory.</source> <translation>Impossible de supprimer le répertoire racine.</translation> @@ -36749,7 +36661,7 @@ Pour compiler l'observateur QML, allez à la page des versions de Qt, séle </message> </context> <context> - <name>Utils::Ssh</name> + <name>::Utils</name> <message> <source>Password Required</source> <translation type="obsolete">Mot de passe requis</translation> @@ -36758,9 +36670,6 @@ Pour compiler l'observateur QML, allez à la page des versions de Qt, séle <source>Please enter the password for your private key.</source> <translation type="obsolete">Veuillez insérer votre mot de passe pour votre clé privée.</translation> </message> -</context> -<context> - <name>Utils::TextFileFormat</name> <message> <source>Out of memory.</source> <translation>Mémoire insuffisante.</translation> @@ -39600,7 +39509,7 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e </message> </context> <context> - <name>Utils::SettingsSelector</name> + <name>::Utils</name> <message> <source>Add</source> <translation>Ajouter</translation> @@ -39625,9 +39534,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e <source>Rename...</source> <translation>Renommer...</translation> </message> -</context> -<context> - <name>Utils::SftpFileSystemModel</name> <message> <source>File Type</source> <translation type="obsolete">Type du fichier</translation> @@ -39644,9 +39550,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e <source>Error listing contents of directory '%1': %2</source> <translation type="obsolete">Erreur lors du listage du contenu du répertoire '%1' : %2</translation> </message> -</context> -<context> - <name>Utils::Internal::SshRemoteProcessPrivate</name> <message> <source>Process killed by signal</source> <translation type="obsolete">Processus tué par un signal</translation> @@ -41970,14 +41873,11 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques.</transl </message> </context> <context> - <name>Utils::BaseTreeView</name> + <name>::Utils</name> <message> <source>Adjust Column Widths to Contents</source> <translation>Ajuster la largeur des colonnes au contenu</translation> </message> -</context> -<context> - <name>Utils::ElfReader</name> <message> <source>'%1' is an invalid ELF object (%2)</source> <translation>"%1" est un objet ELF invalide (%2)</translation> @@ -46830,7 +46730,7 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.</tra </message> </context> <context> - <name>QmlJS::QrcParser</name> + <name>::Utils</name> <message> <source>XML error on line %1, col %2: %3</source> <translation>Erreur XML sur la ligne %1, colonne %2 : %3</translation> @@ -48001,7 +47901,7 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.</tra </message> </context> <context> - <name>Diff</name> + <name>::Utils</name> <message> <source>Delete</source> <translation>Supression</translation> 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 @@ </message> </context> <context> - <name>Utils::WizardPage</name> + <name>::Utils</name> <message> <source>Choose the Location</source> <translation>Odaberi mjesto</translation> @@ -462,9 +462,6 @@ <source>Path:</source> <translation>Staza:</translation> </message> -</context> -<context> - <name>Utils::NewClassWidget</name> <message> <source>&Class name:</source> <translation>Naziv &klase:</translation> @@ -537,18 +534,11 @@ <source>Invalid form file name: "%1"</source> <translation>Nevaljani naziv datoteke obrasca: "%1"</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source>Introduction and Project Location</source> <translation>Uvod i mjesto projekta</translation> </message> <message> - <source>Name:</source> - <translation>Naziv:</translation> - </message> - <message> <source>Create in:</source> <translation>Stvori u:</translation> </message> @@ -592,9 +582,6 @@ <source>Invalid character "%1" found.</source> <translation>Nađen je nevaljani slovni znak "%1".</translation> </message> -</context> -<context> - <name>Utils::ProxyCredentialsDialog</name> <message> <source>Proxy Credentials</source> <translation>Korisnički podaci za poslužitelja</translation> @@ -619,9 +606,6 @@ <source>Password</source> <translation>Lozinka</translation> </message> -</context> -<context> - <name>Utils::RemoveFileDialog</name> <message> <source>Remove File</source> <translation>Ukloni datoteku</translation> @@ -12377,7 +12361,7 @@ The trace data is lost.</source> </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Do not ask again</source> <translation>Ne pitaj ponovo</translation> @@ -12390,9 +12374,6 @@ The trace data is lost.</source> <source>Do not &show again</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::ClassNameValidatingLineEdit</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation type="unfinished"></translation> @@ -12405,9 +12386,6 @@ The trace data is lost.</source> <source>The class name contains invalid characters.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation type="unfinished"></translation> @@ -12476,16 +12454,10 @@ The trace data is lost.</source> <source>Cannot obtain exit status from inferior: %1</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::DetailsButton</name> <message> <source>Details</source> <translation>Detalji</translation> </message> -</context> -<context> - <name>Diff</name> <message> <source>Delete</source> <translation>Ukloni</translation> @@ -12498,9 +12470,6 @@ The trace data is lost.</source> <source>Equal</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::ElfReader</name> <message> <source>"%1" is an invalid ELF object (%2)</source> <translation type="unfinished"></translation> @@ -12545,9 +12514,6 @@ The trace data is lost.</source> <source>section name %1 of %2 behind end of file</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::EnvironmentDialog</name> <message> <source>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.</source> <source>Edit Environment</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::EnvironmentModel</name> <message> <source><UNSET></source> <translation type="unfinished"></translation> @@ -12584,9 +12547,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <extracomment>Value when inserting a new variable</extracomment> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::FancyLineEdit</name> <message> <source>Filter</source> <translation>Filtar</translation> @@ -12616,7 +12576,7 @@ To clear a variable, put its name on a line with nothing else on it.</source> </message> </context> <context> - <name>Utils::FancyMainWindow</name> + <name>::Utils</name> <message> <source>Central Widget</source> <translation type="unfinished"></translation> @@ -12629,13 +12589,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>Automatically Hide View Title Bars</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> - <message> - <source>Name is empty.</source> - <translation>Naziv je prazan.</translation> - </message> <message> <source>Name contains white space.</source> <translation>Naziv sadrži razmake.</translation> @@ -12660,9 +12613,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>File extensions %1 are required:</source> <translation>Datotečni nastavci %1 su obavezni:</translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -12691,9 +12641,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>List of comma separated wildcard filters. Files with file name or full file path matching any filter are included.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::FileUtils</name> <message> <source>Refusing to remove root directory.</source> <translation type="unfinished"></translation> @@ -12727,10 +12674,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <translation type="unfinished"></translation> </message> <message> - <source>File Error</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Cannot write file %1: %2</source> <translation type="unfinished"></translation> </message> @@ -12754,23 +12697,10 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>Cannot create temporary file in %1: %2</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::FileWizardPage</name> - <message> - <source>Location</source> - <translation>Mjesto</translation> - </message> -</context> -<context> - <name>Utils::HostOsInfo</name> <message> <source>Cannot create OpenGL context.</source> <translation>Nije moguće stvoriti kontekst za OpenGL.</translation> </message> -</context> -<context> - <name>JsonTreeModelItem</name> <message> <source>Null</source> <translation>Nula</translation> @@ -12807,9 +12737,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <numerusform>%n stavaka</numerusform> </translation> </message> -</context> -<context> - <name>Utils::MacroExpander</name> <message> <source>Infinite recursion error</source> <translation type="unfinished"></translation> @@ -12904,7 +12831,7 @@ To clear a variable, put its name on a line with nothing else on it.</source> </message> </context> <context> - <name>Utils::PathChooser</name> + <name>::Utils</name> <message> <source>Choose...</source> <translation type="unfinished">Odaberi …</translation> @@ -12962,13 +12889,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <translation type="unfinished"></translation> </message> <message> - <source>Path:</source> - <translation>Staza:</translation> - </message> -</context> -<context> - <name>Utils::PathListEditor</name> - <message> <source>Insert...</source> <translation type="unfinished"></translation> </message> @@ -12980,23 +12900,14 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>Clear</source> <translation>Ukloni</translation> </message> -</context> -<context> - <name>Utils::FileSaverBase</name> <message> <source>File Error</source> <translation>Greška datoteke</translation> </message> -</context> -<context> - <name>Utils::QtcProcess</name> <message> <source>Error in command line.</source> <translation>Greška u naredbenom retku.</translation> </message> -</context> -<context> - <name>Utils::reloadPrompt</name> <message> <source>File Changed</source> <translation>Datoteka je promijenjena</translation> @@ -13017,9 +12928,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>No to All && &Diff</source> <translation>Ne za sve i &razlika</translation> </message> -</context> -<context> - <name>Utils::fileDeletedPrompt</name> <message> <source>File Has Been Removed</source> <translation>Datoteka je uklonjena</translation> @@ -13029,10 +12937,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <translation type="unfinished"></translation> </message> <message> - <source>&Close</source> - <translation>&Zatvori</translation> - </message> - <message> <source>C&lose All</source> <translation>Za&tvori sve</translation> </message> @@ -13044,9 +12948,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>&Save</source> <translation>&Spremi</translation> </message> -</context> -<context> - <name>Utils::SettingsAccessor</name> <message> <source>Failed to Read File</source> <translation type="unfinished"></translation> @@ -13091,9 +12992,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>"%1" is not supported by %2. Do you want to try loading it anyway?</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::EnvironmentIdAccessor</name> <message> <source>Settings File for "%1" from a Different Environment?</source> <translation type="unfinished"></translation> @@ -13102,9 +13000,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source><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></source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::SettingsSelector</name> <message> <source>Add</source> <translation>Dodaj</translation> @@ -13129,9 +13024,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>Rename...</source> <translation>Preimenuj …</translation> </message> -</context> -<context> - <name>Utils::ShellCommand</name> <message> <source>UNKNOWN</source> <translation>NEPOZNATO</translation> @@ -13140,9 +13032,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>Unknown</source> <translation>Nepoznato</translation> </message> -</context> -<context> - <name>Utils::ShellCommandPage</name> <message> <source>Command started...</source> <translation>Naredba je pokrenuta …</translation> @@ -13163,9 +13052,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>Failed.</source> <translation>Neuspjelo.</translation> </message> -</context> -<context> - <name>Utils::SynchronousProcess</name> <message> <source>The command "%1" finished successfully.</source> <translation type="unfinished"></translation> @@ -13202,9 +13088,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>Would you like to terminate it?</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::TextFileFormat</name> <message> <source>Out of memory.</source> <translation type="unfinished"></translation> @@ -13213,16 +13096,10 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>An encoding error was encountered.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::UnixTools</name> <message> <source><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></source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::LinearProgressWidget</name> <message> <source>...</source> <translation>…</translation> @@ -20674,7 +20551,7 @@ Oznake: %3</translation> </message> </context> <context> - <name>Utils::DebuggerMainWindow</name> + <name>::Utils</name> <message> <source>&Views</source> <translation>Prika&zi</translation> 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:</translation> </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Dialog</source> <translation></translation> @@ -16916,9 +16916,6 @@ A következő kódolás valószínűleg erre illik:</translation> <source>CheckBox</source> <translation></translation> </message> -</context> -<context> - <name>Utils::ClassNameValidatingLineEdit</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>Az osztály neve nem tartalmazhat névtér határoló jeleket.</translation> @@ -16931,9 +16928,6 @@ A következő kódolás valószínűleg erre illik:</translation> <source>The class name contains invalid characters.</source> <translation>Az osztálynév érvénytelen karakter(eke)t tartalmaz.</translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation>Nem lehet beállítani a kommunikációs csatornát: %1</translation> @@ -16982,16 +16976,10 @@ A következő kódolás valószínűleg erre illik:</translation> <source>Cannot obtain exit status from inferior: %1</source> <translation>Nem sikerült megszerezni a kilépési státuszt alacsony rendből: %1</translation> </message> -</context> -<context> - <name>Utils::DetailsButton</name> <message> <source>Show Details</source> <translation>Részletek megjelenítése</translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> <message> <source>The name must not be empty</source> <translation>A nevet nem szabad üresen hagyni</translation> @@ -17008,9 +16996,6 @@ A következő kódolás valószínűleg erre illik:</translation> <source>The name must not match that of a MS Windows device. (%1).</source> <translation>A név nem egyezhet meg MS Windows eszközökkel. (%1).</translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation>%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:</translation> <translation>%1: %n előfordulása található %3 fájlok %2-ben. </translation> </message> -</context> -<context> - <name>Utils::NewClassWidget</name> <message> <source>Class name:</source> <translation>Osztály név:</translation> @@ -17089,9 +17071,6 @@ A következő kódolás valószínűleg erre illik:</translation> <source>Invalid form file name: '%1'</source> <translation>Érvénytelen forma fájl név: '%1'</translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>Kiválasztás...</translation> @@ -17125,13 +17104,6 @@ A következő kódolás valószínűleg erre illik:</translation> <translation>A(z) '%1' útvonal nem egy fájl.</translation> </message> <message> - <source>Path:</source> - <translation>Útvonal:</translation> - </message> -</context> -<context> - <name>Utils::PathListEditor</name> - <message> <source>Insert...</source> <translation>Beszúrás...</translation> </message> @@ -17151,9 +17123,6 @@ A következő kódolás valószínűleg erre illik:</translation> <source>From "%1"</source> <translation>"%1"-tól</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source>Introduction and project location</source> <translation>Bemutatás és projekt hely</translation> @@ -17178,16 +17147,10 @@ A következő kódolás valószínűleg erre illik:</translation> <source>A file with that name already exists.</source> <translation>Egy ilyen nevű fájl már létezik.</translation> </message> -</context> -<context> - <name>Utils::ProjectNameValidatingLineEdit</name> <message> <source>The name must not contain the '.'-character.</source> <translation>A név nem tartalmazgat '.' karaktert.</translation> </message> -</context> -<context> - <name>Utils::SubmitEditorWidget</name> <message> <source>Subversion Submit</source> <translation>Subversion feltöltés</translation> @@ -17200,25 +17163,11 @@ A következő kódolás valószínűleg erre illik:</translation> <source>F&iles</source> <translation>&Fájlok</translation> </message> -</context> -<context> - <name>Utils::WizardPage</name> <message> <source>Choose the location</source> <translation>A hely kiválasztása</translation> </message> <message> - <source>Name:</source> - <translation>Név:</translation> - </message> - <message> - <source>Path:</source> - <translation>Útvonal:</translation> - </message> -</context> -<context> - <name>Utils::reloadPrompt</name> - <message> <source>File Changed</source> <translation>File megváltoztatva</translation> </message> 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?</translation> </message> </context> <context> - <name>Utils::ClassNameValidatingLineEdit</name> + <name>::Utils</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>Il nome della classe non deve contenere namespace.</translation> @@ -1723,9 +1723,6 @@ Vuoi sovrascriverli?</translation> <source>The class name contains invalid characters.</source> <translation>Il nome della classe contiene caratteri non validi.</translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation>Impossibile impostare il canale di comunicazione: %1</translation> @@ -1774,9 +1771,6 @@ Vuoi sovrascriverli?</translation> <source>Cannot obtain exit status from inferior: %1</source> <translation>Impossibile ottenere lo stato di uscita da: %1</translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> <message> <source>The name must not be empty</source> <translation>Il nome non deve essere vuoto</translation> @@ -1793,9 +1787,6 @@ Vuoi sovrascriverli?</translation> <source>The name must not match that of a MS Windows device. (%1).</source> <translation>Il nome non può essere quello di un dispositivo MS Windows (%1).</translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -1817,9 +1808,6 @@ Vuoi sovrascriverli?</translation> <numerusform>%1: %n ricorrenze trovate in %2 di %3 file.</numerusform> </translation> </message> -</context> -<context> - <name>Utils::NewClassWidget</name> <message> <source>Class name:</source> <translation>Nome classe:</translation> @@ -1870,9 +1858,6 @@ Vuoi sovrascriverli?</translation> <source>Invalid form file name: '%1'</source> <translation>Nome del file form non valido: '%1'</translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>Scegli...</translation> @@ -1909,9 +1894,6 @@ Vuoi sovrascriverli?</translation> <source>Path:</source> <translation>Percorso:</translation> </message> -</context> -<context> - <name>Utils::PathListEditor</name> <message> <source>Insert...</source> <translation>Inserisci...</translation> @@ -1932,9 +1914,6 @@ Vuoi sovrascriverli?</translation> <source>From "%1"</source> <translation>Da "%1"</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source>Introduction and project location</source> <translation>Introduzione e posizione del progetto</translation> @@ -1961,16 +1940,10 @@ Vuoi sovrascriverli?</translation> <source>A file with that name already exists.</source> <translation>Un file con lo stesso nome è già presente.</translation> </message> -</context> -<context> - <name>Utils::ProjectNameValidatingLineEdit</name> <message> <source>The name must not contain the '.'-character.</source> <translation>Il nome non può contenere il carattere '.'.</translation> </message> -</context> -<context> - <name>Utils::SubmitEditorWidget</name> <message> <source>Subversion Submit</source> <translation>Invio Subversion</translation> @@ -1985,27 +1958,11 @@ Vuoi sovrascriverli?</translation> <source>F&iles</source> <translation>F&ile</translation> </message> -</context> -<context> - <name>Utils::WizardPage</name> <message> <source>Choose the location</source> <translation>Scegli la posizione</translation> </message> <message> - <location/> - <source>Name:</source> - <translation>Nome:</translation> - </message> - <message> - <location/> - <source>Path:</source> - <translation>Percorso:</translation> - </message> -</context> -<context> - <name>Utils::reloadPrompt</name> - <message> <source>File Changed</source> <translation>File Modificato</translation> </message> @@ -10380,7 +10337,7 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Dialog</source> <translation type="unfinished"></translation> @@ -11245,7 +11202,7 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>Utils::DetailsButton</name> + <name>::Utils</name> <message> <source>Show Details</source> <translation type="unfinished"></translation> 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 @@ </message> </context> <context> - <name>Utils::WizardPage</name> + <name>::Utils</name> <message> <source>Choose the Location</source> <translation>パスを選択してください</translation> @@ -368,9 +368,6 @@ <source>Path:</source> <translation>パス:</translation> </message> -</context> -<context> - <name>Utils::NewClassWidget</name> <message> <source>&Class name:</source> <translation>クラス名(&C):</translation> @@ -443,18 +440,11 @@ <source>Invalid form file name: "%1"</source> <translation>無効なフォームファイル名: "%1"</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source>Introduction and Project Location</source> <translation>プロジェクト名とパス</translation> </message> <message> - <source>Name:</source> - <translation>名前:</translation> - </message> - <message> <source>Create in:</source> <translation>パス:</translation> </message> @@ -9664,7 +9654,7 @@ CMake プロジェクトでは、CMakeCache.txt 内で QML_IMPORT_PATH 変数を </message> </context> <context> - <name>QmlJS::QrcParser</name> + <name>::Utils</name> <message> <source>XML error on line %1, col %2: %3</source> <translation>XML の %1 行目 %2 文字目 に誤りがあります: %3</translation> @@ -10372,7 +10362,7 @@ with a password, which you can enter below.</source> </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Do not ask again</source> <translation>今後このメッセージを表示しない</translation> @@ -10393,9 +10383,6 @@ with a password, which you can enter below.</source> <source>Do not &show again</source> <translation>今後このメッセージを表示しない(&S)</translation> </message> -</context> -<context> - <name>Utils::ClassNameValidatingLineEdit</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>クラス名にはネームスペースの区切り文字を含めないでください。</translation> @@ -10408,9 +10395,6 @@ with a password, which you can enter below.</source> <source>The class name contains invalid characters.</source> <translation>クラス名に不正な文字が含まれています。</translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation>通信チャンネルを用意できません: %1</translation> @@ -10479,16 +10463,10 @@ with a password, which you can enter below.</source> <source>Cannot obtain exit status from inferior: %1</source> <translation>プログラムの終了ステータスが取得できません: %1</translation> </message> -</context> -<context> - <name>Utils::DetailsButton</name> <message> <source>Details</source> <translation>詳細</translation> </message> -</context> -<context> - <name>Utils::ElfReader</name> <message> <source>"%1" is an invalid ELF object (%2)</source> <translation>"%1" は、不正な ELF オブジェクトです (%2)</translation> @@ -10531,9 +10509,6 @@ with a password, which you can enter below.</source> <source>section name %1 of %2 behind end of file</source> <translation>%2 のセクション名 %1 がファイルの終端より後ろです</translation> </message> -</context> -<context> - <name>Utils::EnvironmentModel</name> <message> <source><UNSET></source> <translation><未定義></translation> @@ -10556,9 +10531,6 @@ with a password, which you can enter below.</source> <extracomment>Value when inserting a new variable</extracomment> <translation><値></translation> </message> -</context> -<context> - <name>Utils::FancyMainWindow</name> <message> <source>Central Widget</source> <translation>中央のウィジェット</translation> @@ -10571,13 +10543,6 @@ with a password, which you can enter below.</source> <source>Automatically Hide View Title Bars</source> <translation>ビューのタイトルバーを自動的に隠す</translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> - <message> - <source>Name is empty.</source> - <translation>ファイル名が未入力です。</translation> - </message> <message> <source>Name contains white space.</source> <translation>ファイル名に空白が含まれています。</translation> @@ -10606,9 +10571,6 @@ with a password, which you can enter below.</source> <source>File extensions %1 are required:</source> <translation>拡張子 %1 が必要です:</translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -10633,9 +10595,6 @@ with a password, which you can enter below.</source> <source>List of comma separated wildcard filters. Files with file name or full file path matching any filter are included.</source> <translation>コンマで区切られたワイルドカードフィルターのリストです。ファイル名またはフルファイルパスがいずれかのフィルターに一致するファイルが含まれます。</translation> </message> -</context> -<context> - <name>Utils::FileUtils</name> <message> <source>Refusing to remove root directory.</source> <translation>ルートディレクトリは削除できません。</translation> @@ -10704,9 +10663,6 @@ with a password, which you can enter below.</source> <source>Overwrite existing file "%1"?</source> <translation>既存のファイル "%1" を上書きしますか？</translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>選択...</translation> @@ -10776,13 +10732,6 @@ with a password, which you can enter below.</source> <translation>フルパス: <b>%1</b></translation> </message> <message> - <source>Path:</source> - <translation>パス:</translation> - </message> -</context> -<context> - <name>Utils::PathListEditor</name> - <message> <source>Insert...</source> <translation>挿入...</translation> </message> @@ -10794,16 +10743,10 @@ with a password, which you can enter below.</source> <source>Clear</source> <translation>クリア</translation> </message> -</context> -<context> - <name>Utils::QtcProcess</name> <message> <source>Error in command line.</source> <translation>コマンドラインにエラーがあります。</translation> </message> -</context> -<context> - <name>Utils::reloadPrompt</name> <message> <source>File Changed</source> <translation>ファイルは変更されています</translation> @@ -10836,9 +10779,6 @@ with a password, which you can enter below.</source> <source>&Close</source> <translation>閉じる(&C)</translation> </message> -</context> -<context> - <name>Utils::fileDeletedPrompt</name> <message> <source>File has been removed</source> <translation>ファイルは既に削除されています</translation> @@ -10860,10 +10800,6 @@ with a password, which you can enter below.</source> <translation>ファイル %1 は ディスクから削除されました。現在のファイルを別名で保存するかエディタを閉じますか？</translation> </message> <message> - <source>&Close</source> - <translation>閉じる(&C)</translation> - </message> - <message> <source>C&lose All</source> <translation>すべて閉じる(&L)</translation> </message> @@ -10875,9 +10811,6 @@ with a password, which you can enter below.</source> <source>&Save</source> <translation>保存(&S)</translation> </message> -</context> -<context> - <name>Utils::SettingsSelector</name> <message> <source>Add</source> <translation>追加</translation> @@ -10902,9 +10835,6 @@ with a password, which you can enter below.</source> <source>Rename...</source> <translation>名前を変更...</translation> </message> -</context> -<context> - <name>Utils::SynchronousProcess</name> <message> <source>The command "%1" finished successfully.</source> <translation>コマンド "%1" は正常に終了しました。</translation> @@ -10941,9 +10871,6 @@ with a password, which you can enter below.</source> <source>Would you like to terminate it?</source> <translation>終了させますか？</translation> </message> -</context> -<context> - <name>Utils::TextFileFormat</name> <message> <source>Out of memory.</source> <translation>メモリ不足です。</translation> @@ -10952,16 +10879,10 @@ with a password, which you can enter below.</source> <source>An encoding error was encountered.</source> <translation>エンコーディングエラーが発生しました。</translation> </message> -</context> -<context> - <name>Utils::UnixTools</name> <message> <source><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></source> <translation><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></translation> </message> -</context> -<context> - <name>Utils::LinearProgressWidget</name> <message> <source>...</source> <translation>...</translation> @@ -19302,7 +19223,7 @@ Rebuilding the project might help.</source> </message> </context> <context> - <name>Diff</name> + <name>::Utils</name> <message> <source>Delete</source> <translation>削除</translation> @@ -31824,7 +31745,7 @@ Qt バージョンオプションページで qmldump アプリケーション </message> </context> <context> - <name>Utils::FancyLineEdit</name> + <name>::Utils</name> <message> <source>Filter</source> <translation>フィルタ</translation> @@ -32656,7 +32577,7 @@ kill しますか？</translation> </message> </context> <context> - <name>Utils::ProxyCredentialsDialog</name> + <name>::Utils</name> <message> <source>Proxy Credentials</source> <translation>プロキシの認証情報</translation> @@ -32924,11 +32845,7 @@ Are you sure you want to continue?</source> </message> </context> <context> - <name>Utils::FileWizardPage</name> - <message> - <source>Location</source> - <translation>パス</translation> - </message> + <name>::Utils</name> </context> <context> <name>::Android</name> @@ -33303,7 +33220,7 @@ API バージョンが %1 以上の SDK をインストールしてください </message> </context> <context> - <name>Utils::SettingsAccessor</name> + <name>::Utils</name> <message> <source>No Valid Settings Found</source> <translation>有効な設定が見つかりません</translation> @@ -35291,14 +35208,11 @@ the program.</source> </message> </context> <context> - <name>Utils::HostOsInfo</name> + <name>::Utils</name> <message> <source>Cannot create OpenGL context.</source> <translation>OpenGL コンテキストが作成できません。</translation> </message> -</context> -<context> - <name>Utils::MacroExpander</name> <message> <source>Infinite recursion error</source> <translation>無限再帰エラー</translation> @@ -35335,9 +35249,6 @@ the program.</source> <source>Access environment variables.</source> <translation>環境変数にアクセスします。</translation> </message> -</context> -<context> - <name>Utils::ShellCommand</name> <message> <source>UNKNOWN</source> <translation>不明</translation> @@ -35346,9 +35257,6 @@ the program.</source> <source>Unknown</source> <translation>不明</translation> </message> -</context> -<context> - <name>Utils::ShellCommandPage</name> <message> <source>Command started...</source> <translation>コマンドが起動されました...</translation> @@ -37474,7 +37382,7 @@ Setting breakpoints by file name and line number may fail.</source> </message> </context> <context> - <name>Utils::DebuggerMainWindow</name> + <name>::Utils</name> <message> <source>Views</source> <translation>ビュー</translation> @@ -41827,7 +41735,7 @@ Android パッケージソースディレクトリのファイルはビルドデ </message> </context> <context> - <name>Utils::EnvironmentDialog</name> + <name>::Utils</name> <message> <source>Enter one variable per line with the variable name separated from the variable value by "=".<br>Environment variables can be referenced with ${OTHER}.</source> <translation>一行に付き一つの変数をその名と値を "=" で繋ぐ形式で入力してください。<br>他の環境変数は ${OTHER} の形式で参照できます。</translation> @@ -42586,7 +42494,7 @@ Output: </message> </context> <context> - <name>Utils::RemoveFileDialog</name> + <name>::Utils</name> <message> <source>Remove File</source> <translation>ファイルを削除する</translation> @@ -43293,11 +43201,7 @@ Output: </message> </context> <context> - <name>Utils::FileSaverBase</name> - <message> - <source>File Error</source> - <translation>ファイルエラー</translation> - </message> + <name>::Utils</name> </context> <context> <name>ADS::DockWidgetTab</name> @@ -43636,7 +43540,7 @@ The trace data is lost.</source> </message> </context> <context> - <name>Utils::Archive</name> + <name>::Utils</name> <message> <source>File format not supported.</source> <translation>未対応のファイル形式です。</translation> @@ -43667,9 +43571,6 @@ in "%2". </translation> </message> -</context> -<context> - <name>Utils::TriStateAspect</name> <message> <source>Enable</source> <translation>有効</translation> @@ -43682,16 +43583,10 @@ in "%2". <source>Leave at Default</source> <translation>デフォルトのままで</translation> </message> -</context> -<context> - <name>Utils::BaseTreeView</name> <message> <source>Show %1 Column</source> <translation>%1 列を表示する</translation> </message> -</context> -<context> - <name>Utils::InfoBarDisplay</name> <message> <source>Do Not Show Again</source> <translation>今後このメッセージを表示しない</translation> @@ -43700,9 +43595,6 @@ in "%2". <source>Close</source> <translation>閉じる</translation> </message> -</context> -<context> - <name>JsonTreeModelItem</name> <message> <source>String</source> <translation>文字列</translation> @@ -43715,41 +43607,10 @@ in "%2". <source>Undefined</source> <translation>未定義</translation> </message> -</context> -<context> - <name>Utils::NameValueModel</name> - <message> - <source><UNSET></source> - <translation><未定義></translation> - </message> - <message> - <source>Variable</source> - <translation>変数</translation> - </message> - <message> - <source>Value</source> - <translation>値</translation> - </message> - <message> - <source><VARIABLE></source> - <extracomment>Name when inserting a new variable</extracomment> - <translation><変数></translation> - </message> - <message> - <source><VALUE></source> - <extracomment>Value when inserting a new variable</extracomment> - <translation><値></translation> - </message> -</context> -<context> - <name>StringUtils</name> <message> <source>Elapsed time: %1.</source> <translation>経過時間: %1.</translation> </message> -</context> -<context> - <name>Utils::VariableChooser</name> <message> <source>Insert Variable</source> <translation>変数の挿入</translation> 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 @@ </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Do not ask again</source> <translation>Nie pytaj ponownie</translation> @@ -74,9 +74,6 @@ <source>Do not &show again</source> <translation>Nie po&kazuj ponownie</translation> </message> -</context> -<context> - <name>Utils::WizardPage</name> <message> <source>Name:</source> <translation>Nazwa:</translation> @@ -89,9 +86,6 @@ <source>Choose the Location</source> <translation>Wybierz położenie</translation> </message> -</context> -<context> - <name>Utils::NewClassWidget</name> <message> <source>Invalid base class name</source> <translation>Niepoprawna nazwa klasy bazowej</translation> @@ -164,13 +158,6 @@ <source>Inherits QQuickItem - Qt Quick 2</source> <translation>Dziedziczy z QDeclarativeItem (wersja Qt Quick 2)</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> - <message> - <source>Name:</source> - <translation>Nazwa:</translation> - </message> <message> <source>Create in:</source> <translation>Utwórz w:</translation> @@ -1658,7 +1645,7 @@ Przyczyna: %3</translation> </message> </context> <context> - <name>Utils::ClassNameValidatingLineEdit</name> + <name>::Utils</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>Nazwa klasy nie może zawierać separatorów przestrzeni nazw.</translation> @@ -1671,9 +1658,6 @@ Przyczyna: %3</translation> <source>The class name contains invalid characters.</source> <translation>Nazwa klasy zawiera niepoprawne znaki.</translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation>Nie można ustawić kanału komunikacyjnego: %1</translation> @@ -1742,20 +1726,10 @@ Przyczyna: %3</translation> <source>Cannot obtain exit status from inferior: %1</source> <translation>Nie otrzymano kodu wyjściowego podprocesu: %1</translation> </message> -</context> -<context> - <name>Utils::DetailsButton</name> <message> <source>Details</source> <translation>Szczegóły</translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> - <message> - <source>Name is empty.</source> - <translation>Nazwa jest pusta.</translation> - </message> <message> <source>Name contains white space.</source> <translation>Nazwa zawiera spację.</translation> @@ -1780,9 +1754,6 @@ Przyczyna: %3</translation> <source>File extensions %1 are required:</source> <translation>Wymagane są rozszerzenia %1 plików:</translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -1811,9 +1782,6 @@ Przyczyna: %3</translation> <source>List of comma separated wildcard filters. Files with file name or full file path matching any filter are included.</source> <translation>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.</translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>Wybierz...</translation> @@ -1871,13 +1839,6 @@ Przyczyna: %3</translation> <translation>Ścieżka nie może być pusta.</translation> </message> <message> - <source>Path:</source> - <translation>Ścieżka:</translation> - </message> -</context> -<context> - <name>Utils::PathListEditor</name> - <message> <source>Insert...</source> <translation>Wstaw...</translation> </message> @@ -1889,9 +1850,6 @@ Przyczyna: %3</translation> <source>Clear</source> <translation>Wyczyść</translation> </message> -</context> -<context> - <name>Utils::reloadPrompt</name> <message> <source>File Changed</source> <translation>Plik został zmieniony</translation> @@ -10333,7 +10291,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM </message> </context> <context> - <name>Utils::fileDeletedPrompt</name> + <name>::Utils</name> <message> <source>File has been removed</source> <translation>Plik został usunięty</translation> @@ -10347,10 +10305,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM <translation>Plik %1 został usunięty. Zachować go pod inną nazwą, czy zamknąć edytor?</translation> </message> <message> - <source>&Close</source> - <translation>Za&mknij</translation> - </message> - <message> <source>C&lose All</source> <translation>Zamknij &wszystko</translation> </message> @@ -10362,16 +10316,10 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM <source>&Save</source> <translation>&Zachowaj</translation> </message> -</context> -<context> - <name>Utils::UnixTools</name> <message> <source><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></source> <translation><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></translation> </message> -</context> -<context> - <name>Utils::LinearProgressWidget</name> <message> <source>...</source> <translation>...</translation> @@ -11720,7 +11668,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM </message> </context> <context> - <name>Utils::FancyMainWindow</name> + <name>::Utils</name> <message> <source>Central Widget</source> <translation>Centralny Widżet</translation> @@ -12495,7 +12443,7 @@ Identyfikatory muszą rozpoczynać się małą literą.</translation> </message> </context> <context> - <name>Utils::SynchronousProcess</name> + <name>::Utils</name> <message> <source>The command "%1" finished successfully.</source> <translation>Komenda "%1" poprawnie zakończona.</translation> @@ -13895,7 +13843,7 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Utils::EnvironmentModel</name> + <name>::Utils</name> <message> <source><UNSET></source> <translation><USUNIĘTO></translation> @@ -13918,9 +13866,6 @@ Local pulls are not applied to the master branch.</source> <extracomment>Value when inserting a new variable</extracomment> <translation><WARTOŚĆ></translation> </message> -</context> -<context> - <name>Utils::QtcProcess</name> <message> <source>Error in command line.</source> <translation>Błąd w linii komend.</translation> @@ -16301,7 +16246,7 @@ With cache simulation, further event counters are enabled: </message> </context> <context> - <name>Utils::FileUtils</name> + <name>::Utils</name> <message> <source>Refusing to remove root directory.</source> <translation>Odmowa usunięcia katalogu głównego.</translation> @@ -17584,7 +17529,7 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem.</translation> </message> </context> <context> - <name>Utils::TextFileFormat</name> + <name>::Utils</name> <message> <source>Out of memory.</source> <translation>Brak pamięci.</translation> @@ -19987,7 +19932,7 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS.</translation> </message> </context> <context> - <name>Utils::ElfReader</name> + <name>::Utils</name> <message> <source>"%1" is an invalid ELF object (%2)</source> <translation>"%1" nie jest poprawnym obiektem ELF (%2)</translation> @@ -20032,9 +19977,6 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS.</translation> <source>section name %1 of %2 behind end of file</source> <translation>nazwa sekcji %1 z %2 poza EOF</translation> </message> -</context> -<context> - <name>Utils::SettingsSelector</name> <message> <source>Add</source> <translation>Dodaj</translation> @@ -23278,7 +23220,7 @@ Można używać nazw częściowych, jeśli są one unikalne.</translation> </message> </context> <context> - <name>QmlJS::QrcParser</name> + <name>::Utils</name> <message> <source>XML error on line %1, col %2: %3</source> <translation>Błąd XML w linii %1, w kolumnie %2: %3</translation> @@ -24181,7 +24123,7 @@ Więcej informacji w dokumentacji "Checking Code Syntax".</translation </message> </context> <context> - <name>Diff</name> + <name>::Utils</name> <message> <source>Delete</source> <translation>Usunięto</translation> @@ -27109,7 +27051,7 @@ Zbuduj aplikację qmldump na stronie z opcjami wersji Qt.</translation> </message> </context> <context> - <name>Utils::FancyLineEdit</name> + <name>::Utils</name> <message> <source>Filter</source> <translation>Filtr</translation> @@ -27829,7 +27771,7 @@ Czy przerwać ją?</translation> </message> </context> <context> - <name>Utils::ProxyCredentialsDialog</name> + <name>::Utils</name> <message> <source>Proxy Credentials</source> <translation>Pośrednie listy uwierzytelniające</translation> @@ -28403,14 +28345,7 @@ Czy kontynuować instalację?</translation> </message> </context> <context> - <name>Utils::FileWizardPage</name> - <message> - <source>Location</source> - <translation>Położenie</translation> - </message> -</context> -<context> - <name>Utils::MacroExpander</name> + <name>::Utils</name> <message> <source>Infinite recursion error</source> <translation>Błąd: nieskończona pętla</translation> @@ -31168,7 +31103,7 @@ Use this only if you are prototyping. You cannot create a full application with </message> </context> <context> - <name>Utils::SettingsAccessor</name> + <name>::Utils</name> <message> <source>No Valid Settings Found</source> <translation>Brak poprawnych ustawień</translation> @@ -31798,7 +31733,7 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan </message> </context> <context> - <name>Utils::ShellCommand</name> + <name>::Utils</name> <message> <source>UNKNOWN</source> <translation>NIEZNANY</translation> @@ -31807,9 +31742,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan <source>Unknown</source> <translation>Nieznany</translation> </message> -</context> -<context> - <name>Utils::ShellCommandPage</name> <message> <source>Command started...</source> <translation>Komenda uruchomiona...</translation> @@ -34051,7 +33983,7 @@ itself takes time.</source> </message> </context> <context> - <name>Utils::HostOsInfo</name> + <name>::Utils</name> <message> <source>Cannot create OpenGL context.</source> <translation>Nie można utworzyć kontekstu OpenGL.</translation> @@ -35794,7 +35726,7 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation> </message> </context> <context> - <name>Utils::DebuggerMainWindow</name> + <name>::Utils</name> <message> <source>&Views</source> <translation>&Widoki</translation> @@ -36475,7 +36407,7 @@ po naciśnięciu klawisza backspace</translation> </message> </context> <context> - <name>Utils::EnvironmentDialog</name> + <name>::Utils</name> <message> <source>Enter one variable per line with the variable name separated from the variable value by "=".<br>Environment variables can be referenced with ${OTHER}.</source> <translation>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}.</translation> @@ -40027,14 +39959,7 @@ Błąd: %5</translation> </message> </context> <context> - <name>Utils::FileSaverBase</name> - <message> - <source>File Error</source> - <translation>Błąd pliku</translation> - </message> -</context> -<context> - <name>Utils::SaveFile</name> + <name>::Utils</name> <message> <source>File might be locked.</source> <translation>Plik może być zablokowany.</translation> 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.</source> </message> </context> <context> - <name>Diff</name> + <name>::Utils</name> <message> <source>Delete</source> <translation>Удалено</translation> @@ -23607,7 +23607,7 @@ Error: %5</translation> </message> </context> <context> - <name>JsonTreeModelItem</name> + <name>::Utils</name> <message> <source>Null</source> <translation>Null</translation> @@ -37578,7 +37578,7 @@ Please build the qmldump application on the Qt version options page.</source> </message> </context> <context> - <name>QmlJS::QrcParser</name> + <name>::Utils</name> <message> <source>XML error on line %1, col %2: %3</source> <translation>Ошибка XML в строке %1, поз. %2: %3</translation> @@ -42501,7 +42501,7 @@ Row: %4, Column: %5 </message> </context> <context> - <name>StringUtils</name> + <name>::Utils</name> <message> <source>Elapsed time: %1.</source> <translation>Прошло времени: %1.</translation> @@ -45962,7 +45962,7 @@ The trace data is lost.</source> </message> </context> <context> - <name>Utils::Archive</name> + <name>::Utils</name> <message> <source>File format not supported.</source> <translation>Формат файла не поддерживается.</translation> @@ -45994,9 +45994,6 @@ in "%2". </translation> </message> -</context> -<context> - <name>Utils::CheckableMessageBox</name> <message> <source>Do not ask again</source> <translation>Больше не спрашивать</translation> @@ -46017,9 +46014,6 @@ in "%2". <source>Do not &show again</source> <translation>Больше не п&оказывать</translation> </message> -</context> -<context> - <name>Utils::ClassNameValidatingLineEdit</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>Имя класса не должно содержать разделителей пространств имён.</translation> @@ -46032,9 +46026,6 @@ in "%2". <source>The class name contains invalid characters.</source> <translation>Имя класса содержит недопустимые символы.</translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation>Не удалось создать канал передачи данных: %1</translation> @@ -46103,9 +46094,6 @@ in "%2". <source>Cannot obtain exit status from inferior: %1</source> <translation>Не удалось получить код завершения подчинённого процесса: %1</translation> </message> -</context> -<context> - <name>Utils::DebuggerMainWindow</name> <message> <source>&Views</source> <translation>&Обзоры</translation> @@ -46130,16 +46118,10 @@ in "%2". <source>Stop</source> <translation>Остановить</translation> </message> -</context> -<context> - <name>Utils::DetailsButton</name> <message> <source>Details</source> <translation>Подробнее</translation> </message> -</context> -<context> - <name>Utils::ElfReader</name> <message> <source>"%1" is an invalid ELF object (%2)</source> <translation>«%1» не является корректным объектом ELF (%2)</translation> @@ -46184,9 +46166,6 @@ in "%2". <source>section name %1 of %2 behind end of file</source> <translation>имя секции %1 из %2 выходит за конец файла</translation> </message> -</context> -<context> - <name>Utils::EnvironmentDialog</name> <message> <source>Edit Environment</source> <translation>Изменение среды</translation> @@ -46203,9 +46182,6 @@ To disable a variable, prefix the line with "#".</source> Для очистки переменной в строке укажите только её имя и больше ничего. Для отключения переменной, закомментируйте строку символом «#».</translation> </message> -</context> -<context> - <name>Utils::EnvironmentIdAccessor</name> <message> <source>Settings File for "%1" from a Different Environment?</source> <translation>Настройки проекта «%1» с другого компьютера?</translation> @@ -46214,16 +46190,6 @@ To disable a variable, prefix the line with "#".</source> <source><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></source> <translation><p>Не удалось найти файл настроек от этого экземпляра %1.</p><p>Возможно вы работали с этим проектом на другой машине или использовали другой путь к настройкам.</p><p>Продолжить загрузку файла настроек «%2»?</p></translation> </message> -</context> -<context> - <name>Utils::EnvironmentModel</name> - <message> - <source><VARIABLE></source> - <translation><переменная></translation> - </message> -</context> -<context> - <name>Utils::FancyLineEdit</name> <message> <source>Filter</source> <translation>Фильтр</translation> @@ -46232,9 +46198,6 @@ To disable a variable, prefix the line with "#".</source> <source>Clear text</source> <translation>Очистить текст</translation> </message> -</context> -<context> - <name>Utils::FancyMainWindow</name> <message> <source>Central Widget</source> <translation>Центральный виджет</translation> @@ -46247,9 +46210,6 @@ To disable a variable, prefix the line with "#".</source> <source>Automatically Hide View Title Bars</source> <translation>Автоматически скрывать заголовки окон</translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> <message> <source>Name is empty.</source> <translation>Имя задано пустым.</translation> @@ -46278,16 +46238,6 @@ To disable a variable, prefix the line with "#".</source> <source>File extensions %1 are required:</source> <translation>Требуются файловые расширения %1:</translation> </message> -</context> -<context> - <name>Utils::FileSaverBase</name> - <message> - <source>File Error</source> - <translation>Файловая ошибка</translation> - </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -46316,9 +46266,6 @@ To disable a variable, prefix the line with "#".</source> <source>List of comma separated wildcard filters. Files with file name or full file path matching any filter are included.</source> <translation>Список фильтров, разделенных запятыми. Будут включены файлы, имя или полный путь которых подходит минимум одному фильтру.</translation> </message> -</context> -<context> - <name>Utils::FileUtils</name> <message> <source>Refusing to remove root directory.</source> <translation>Предотвращение удаления корневого каталога.</translation> @@ -46387,9 +46334,6 @@ To disable a variable, prefix the line with "#".</source> <source>Overwrite existing file "%1"?</source> <translation>Перезаписать существующий файл «%1»?</translation> </message> -</context> -<context> - <name>Utils::FileWizardPage</name> <message> <source>Location</source> <translation>Размещение</translation> @@ -46398,16 +46342,10 @@ To disable a variable, prefix the line with "#".</source> <source>The default suffix if you do not explicitly specify a file extension is ".%1".</source> <translation>По умолчанию, если не указано явно, используется расширение файлов «.%1».</translation> </message> -</context> -<context> - <name>Utils::HostOsInfo</name> <message> <source>Cannot create OpenGL context.</source> <translation>Не удалось создать контекст OpenGL.</translation> </message> -</context> -<context> - <name>Utils::InfoBarDisplay</name> <message> <source>&Show Details</source> <translation>Показать п&одробности</translation> @@ -46420,16 +46358,10 @@ To disable a variable, prefix the line with "#".</source> <source>Close</source> <translation>Закрыть</translation> </message> -</context> -<context> - <name>Utils::LinearProgressWidget</name> <message> <source>...</source> <translation>...</translation> </message> -</context> -<context> - <name>Utils::MacroExpander</name> <message> <source>Infinite recursion error</source> <translation>Ошибка бесконечной рекурсии</translation> @@ -46466,9 +46398,6 @@ To disable a variable, prefix the line with "#".</source> <source>Access environment variables.</source> <translation>Доступ к переменным среды.</translation> </message> -</context> -<context> - <name>Utils::NameValueModel</name> <message> <source><UNSET></source> <translation><не задано></translation> @@ -46491,9 +46420,6 @@ To disable a variable, prefix the line with "#".</source> <extracomment>Value when inserting a new variable</extracomment> <translation><значение></translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>Выбрать...</translation> @@ -46554,9 +46480,6 @@ To disable a variable, prefix the line with "#".</source> <source>Path:</source> <translation>Путь:</translation> </message> -</context> -<context> - <name>Utils::PathListEditor</name> <message> <source>Insert...</source> <translation>Вставить...</translation> @@ -46569,18 +46492,11 @@ To disable a variable, prefix the line with "#".</source> <source>Clear</source> <translation>Очистить</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source>Enter project name</source> <translation>Введите название проекта</translation> </message> <message> - <source>Location</source> - <translation>Размещение</translation> - </message> - <message> <source>The project already exists.</source> <translation>Проект уже существует.</translation> </message> @@ -46589,10 +46505,6 @@ To disable a variable, prefix the line with "#".</source> <translation>Файл с таким именем уже существует.</translation> </message> <message> - <source>Name is empty.</source> - <translation>Имя задано пустым.</translation> - </message> - <message> <source>Name does not match "%1".</source> <translation>Имя не соответствует «%1».</translation> </message> @@ -46624,9 +46536,6 @@ To disable a variable, prefix the line with "#".</source> <source>Project:</source> <translation>Проект:</translation> </message> -</context> -<context> - <name>Utils::ProxyCredentialsDialog</name> <message> <source>Proxy Credentials</source> <translation>Авторизация на прокси-сервере</translation> @@ -46651,9 +46560,6 @@ To disable a variable, prefix the line with "#".</source> <source>Password</source> <translation>Пароль</translation> </message> -</context> -<context> - <name>Utils::QtcProcess</name> <message> <source>Error in command line.</source> <translation>Ошибка в командной строке.</translation> @@ -46662,9 +46568,6 @@ To disable a variable, prefix the line with "#".</source> <source>Invalid command</source> <translation>Неверная команда</translation> </message> -</context> -<context> - <name>Utils::RemoveFileDialog</name> <message> <source>Remove File</source> <translation>Удаление файла</translation> @@ -46681,9 +46584,6 @@ To disable a variable, prefix the line with "#".</source> <source>&Remove from version control</source> <translation>Удалить из-под &контроля версий</translation> </message> -</context> -<context> - <name>Utils::SettingsAccessor</name> <message> <source>Failed to Read File</source> <translation>Не удалось прочитать файл</translation> @@ -46728,9 +46628,6 @@ To disable a variable, prefix the line with "#".</source> <source>"%1" is not supported by %2. Do you want to try loading it anyway?</source> <translation>«%1» не поддерживается %2. Попытаться продолжить загрузку?</translation> </message> -</context> -<context> - <name>Utils::SettingsSelector</name> <message> <source>Add</source> <translation>Добавить</translation> @@ -46755,9 +46652,6 @@ To disable a variable, prefix the line with "#".</source> <source>Rename...</source> <translation>Переименовать...</translation> </message> -</context> -<context> - <name>Utils::ShellCommand</name> <message> <source>UNKNOWN</source> <translation>НЕИЗВЕСТНАЯ</translation> @@ -46766,9 +46660,6 @@ To disable a variable, prefix the line with "#".</source> <source>Unknown</source> <translation>Неизвестная</translation> </message> -</context> -<context> - <name>Utils::ShellCommandPage</name> <message> <source>Command started...</source> <translation>Команда запущена...</translation> @@ -46789,9 +46680,6 @@ To disable a variable, prefix the line with "#".</source> <source>Failed.</source> <translation>Сбой.</translation> </message> -</context> -<context> - <name>Utils::SynchronousProcess</name> <message> <source>The command "%1" finished successfully.</source> <translation>Команда «%1» успешно завершилась.</translation> @@ -46828,9 +46716,6 @@ To disable a variable, prefix the line with "#".</source> <source>Would you like to terminate it?</source> <translation>Желаете завершить его?</translation> </message> -</context> -<context> - <name>Utils::TextFileFormat</name> <message> <source>Out of memory.</source> <translation>Не хватает памяти.</translation> @@ -46839,20 +46724,10 @@ To disable a variable, prefix the line with "#".</source> <source>An encoding error was encountered.</source> <translation>Ошибка кодировки.</translation> </message> -</context> -<context> - <name>Utils::UnixTools</name> <message> <source><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></source> <translation><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></translation> </message> -</context> -<context> - <name>Utils::WizardPage</name> - <message> - <source>Path:</source> - <translation>Путь:</translation> - </message> <message> <source>Choose the Location</source> <translation>Выбор размещения</translation> @@ -46861,9 +46736,6 @@ To disable a variable, prefix the line with "#".</source> <source>File name:</source> <translation>Имя файла:</translation> </message> -</context> -<context> - <name>Utils::fileDeletedPrompt</name> <message> <source>File Has Been Removed</source> <translation>Файл был удалён</translation> @@ -46888,9 +46760,6 @@ To disable a variable, prefix the line with "#".</source> <source>&Save</source> <translation>&Сохранить</translation> </message> -</context> -<context> - <name>Utils::reloadPrompt</name> <message> <source>File Changed</source> <translation>Файл изменён</translation> @@ -46908,10 +46777,6 @@ To disable a variable, prefix the line with "#".</source> <translation>Поведение по умолчание можно задать в Инструменты > Параметры > Среда > Система.</translation> </message> <message> - <source>&Close</source> - <translation>&Закрыть</translation> - </message> - <message> <source>No to All && &Diff</source> <translation>Нет для всех и с&равнить</translation> </message> 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; } </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Dialog</source> <translation>Pogovorno okno</translation> @@ -10032,26 +10032,15 @@ p, li { white-space: pre-wrap; } <source>CheckBox</source> <translation type="obsolete">PotrditvenoPolje</translation> </message> -</context> -<context> - <name>Utils::WizardPage</name> <message> <source>Name:</source> <translation>Ime:</translation> </message> <message> <location/> - <source>Path:</source> - <translation>Pot:</translation> - </message> - <message> - <location/> <source>Choose the Location</source> <translation>Izberite mesto</translation> </message> -</context> -<context> - <name>Utils::NewClassWidget</name> <message> <source>Inherits QObject</source> <translation>Podeduje QObject</translation> @@ -10131,13 +10120,6 @@ p, li { white-space: pre-wrap; } <source>Inherits QDeclarativeItem</source> <translation>Podeduje od QDeclarativeItem</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> - <message> - <source>Name:</source> - <translation>Ime:</translation> - </message> <message> <location/> <source>Create in:</source> @@ -10168,9 +10150,6 @@ p, li { white-space: pre-wrap; } <source>Introduction and project location</source> <translation type="obsolete">Uvod in lokacija projekta</translation> </message> -</context> -<context> - <name>Utils::SubmitEditorWidget</name> <message> <source>Subversion Submit</source> <translation>Pošiljanje Subversion</translation> @@ -11131,7 +11110,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan </message> </context> <context> - <name>Utils::ClassNameValidatingLineEdit</name> + <name>::Utils</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>Ime razreda ne sme vsebovati ločil imenskega prostora.</translation> @@ -11144,9 +11123,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan <source>The class name contains invalid characters.</source> <translation>Ime razreda vsebuje neveljavne znake.</translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation>Ni moč vzpostaviti komunikacijskega kanala: %1</translation> @@ -11219,16 +11195,10 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan <source>Unexpected output from helper program.</source> <translation type="obsolete">Nepričakovan izhod od pomožnega programa.</translation> </message> -</context> -<context> - <name>Utils::DetailsButton</name> <message> <source>Details</source> <translation>Podrobnosti</translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -11256,9 +11226,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan <numerusform>%1: najdenih %n pojavitev v %2 od %3 datotek.</numerusform> </translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>Izbor …</translation> @@ -11323,9 +11290,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan <source>The path '%1' is not a file.</source> <translation type="obsolete">Pot »%1« ni datoteka.</translation> </message> -</context> -<context> - <name>Utils::PathListEditor</name> <message> <source>Insert...</source> <translation>Vstavi …</translation> @@ -11346,16 +11310,10 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan <source>From "%1"</source> <translation>Iz »%1«</translation> </message> -</context> -<context> - <name>Utils::ProjectNameValidatingLineEdit</name> <message> <source>Invalid character '.'.</source> <translation>Neveljaven znak ».«.</translation> </message> -</context> -<context> - <name>Utils::reloadPrompt</name> <message> <source>File Changed</source> <translation>Datoteka spremenjena</translation> @@ -14420,7 +14378,7 @@ okoljsko spremenljivko SSH_ASKPASS.</translation> </message> </context> <context> - <name>Utils::FancyMainWindow</name> + <name>::Utils</name> <message> <source>Locked</source> <translation>Zaklenjeno</translation> @@ -14429,16 +14387,10 @@ okoljsko spremenljivko SSH_ASKPASS.</translation> <source>Reset to Default Layout</source> <translation>Ponastavi na privzeti razpored</translation> </message> -</context> -<context> - <name>Utils::FileWizardDialog</name> <message> <source>Location</source> <translation>Mesto</translation> </message> -</context> -<context> - <name>Utils::FilterLineEdit</name> <message> <source>Filter</source> <translation>Filter</translation> @@ -14447,9 +14399,6 @@ okoljsko spremenljivko SSH_ASKPASS.</translation> <source>Clear text</source> <translation>Počisti besedilo</translation> </message> -</context> -<context> - <name>Utils::fileDeletedPrompt</name> <message> <source>File has been removed</source> <translation>Datoteka je bila odstranjena</translation> @@ -14474,16 +14423,10 @@ okoljsko spremenljivko SSH_ASKPASS.</translation> <source>Save</source> <translation>Shrani</translation> </message> -</context> -<context> - <name>Utils::UnixTools</name> <message> <source><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></source> <translation><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></translation> </message> -</context> -<context> - <name>Utils::LinearProgressWidget</name> <message> <source>...</source> <translation> …</translation> @@ -20899,7 +20842,7 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: </message> </context> <context> - <name>Utils::DebuggerLanguageChooser</name> + <name>::Utils</name> <message> <source>C++</source> <translation>C++</translation> @@ -20916,9 +20859,6 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: <source><a href="qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html">What are the prerequisites?</a></source> <translation><a href="qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html">Kaj je potrebno?</a></translation> </message> -</context> -<context> - <name>Utils::EnvironmentModel</name> <message> <source><UNSET></source> <translation><ni nastavljena></translation> @@ -20943,9 +20883,6 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: </extracomment> <translation><vrednost></translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> <message> <source>Name is empty.</source> <translation>Ime je prazno.</translation> @@ -20966,9 +20903,6 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: <source>Name matches MS Windows device. (%1).</source> <translation>Ime je enako napravi v Windows. (%1).</translation> </message> -</context> -<context> - <name>Utils::FileUtils</name> <message> <source>Failed to remove directory '%1'.</source> <translation>Odstranjevanje mape »%1« ni uspelo.</translation> @@ -21013,23 +20947,14 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: <source>Cannot create temporary file in %1: %2</source> <translation>Začasne datoteke v %1 ni moč ustvariti: %2</translation> </message> -</context> -<context> - <name>Utils::IpAddressLineEdit</name> <message> <source>The IP address is not valid.</source> <translation>Naslov IP ni veljaven.</translation> </message> -</context> -<context> - <name>Utils::QtcProcess</name> <message> <source>Error in command line.</source> <translation>Napaka v ukazni vrstici.</translation> </message> -</context> -<context> - <name>Utils::Internal::SftpChannelPrivate</name> <message> <source>Server could not start sftp subsystem.</source> <translation>Strežnik ni mogel zagnati podsistema sftp.</translation> @@ -21121,14 +21046,11 @@ Seznam za strežnik je: %2.</translation> </message> </context> <context> - <name>Utils::Internal::SshChannelManager</name> + <name>::Utils</name> <message> <source>Invalid channel id %1</source> <translation>Neveljavna identifikacija kanala: %1</translation> </message> -</context> -<context> - <name>Utils::Internal::SshConnectionPrivate</name> <message> <source>SSH Protocol error: %1</source> <translation>Napaka protokola SSH: %1</translation> @@ -21146,10 +21068,6 @@ Seznam za strežnik je: %2.</translation> <translation>Neveljavna identifikacija strežnika: »%1«.</translation> </message> <message> - <source>Unexpected packet of type %1.</source> - <translation>Nepričakovan paket vrste %1.</translation> - </message> - <message> <source>Private key error: %1</source> <translation>Napaka glede zasebnega ključa: %1</translation> </message> @@ -21181,9 +21099,6 @@ Seznam za strežnik je: %2.</translation> <source>Timeout waiting for reply from server.</source> <translation>Čas za čakanje na odgovor strežnika je potekel.</translation> </message> -</context> -<context> - <name>Utils::SynchronousProcess</name> <message> <source>The command '%1' finished successfully.</source> <translation>Ukaz »%1« se je uspešno zaključil.</translation> 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.</source> </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Do not ask again</source> <translation>Не питати знову</translation> @@ -19727,9 +19727,6 @@ Will not be applied to whitespace in comments and strings.</source> <source>Do not &show again</source> <translation>Не &показувати знову</translation> </message> -</context> -<context> - <name>Utils::ClassNameValidatingLineEdit</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>Назва класу не повинна містити розділювачі простору імен.</translation> @@ -19742,9 +19739,6 @@ Will not be applied to whitespace in comments and strings.</source> <source>The class name contains invalid characters.</source> <translation>Назва класу містить неправильні символи.</translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation>Неможливо встановити комунікаційний канал: %1</translation> @@ -19837,16 +19831,10 @@ Will not be applied to whitespace in comments and strings.</source> <source>Cannot obtain exit status from inferior: %1</source> <translation>Неможливо отримати код завершення підлеглого процесу: %1</translation> </message> -</context> -<context> - <name>Utils::DetailsButton</name> <message> <source>Details</source> <translation>Деталі</translation> </message> -</context> -<context> - <name>Utils::EnvironmentModel</name> <message> <source><UNSET></source> <translation><НЕ ЗАДАНО></translation> @@ -19869,9 +19857,6 @@ Will not be applied to whitespace in comments and strings.</source> <extracomment>Value when inserting a new variable</extracomment> <translation><ЗНАЧЕННЯ></translation> </message> -</context> -<context> - <name>Utils::FancyMainWindow</name> <message> <source>Locked</source> <translation type="vanished">Зафіксовано</translation> @@ -19884,9 +19869,6 @@ Will not be applied to whitespace in comments and strings.</source> <source>Automatically Hide View Title Bars</source> <translation>Автоматично ховати заголовки перегляду</translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> <message> <source>Name is empty.</source> <translation>Порожнє ім'я.</translation> @@ -19923,9 +19905,6 @@ Will not be applied to whitespace in comments and strings.</source> <source>File extensions %1 are required:</source> <translation>Необхідні розширення файлу %1:</translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -19950,9 +19929,6 @@ Will not be applied to whitespace in comments and strings.</source> <numerusform>%1: %n збігів знайдено в %2 з %3 файлів.</numerusform> </translation> </message> -</context> -<context> - <name>Utils::FileUtils</name> <message> <source>Refusing to remove root directory.</source> <translation>Відмова від видалення кореневої теки.</translation> @@ -20021,41 +19997,14 @@ Will not be applied to whitespace in comments and strings.</source> <source>Cannot create temporary file in %1: %2</source> <translation>Неможливо створити тимчасовий файл в %1: %2</translation> </message> -</context> -<context> - <name>Utils::FileWizardDialog</name> - <message> - <source>Location</source> - <translation type="vanished">Розташування</translation> - </message> -</context> -<context> - <name>Utils::FilterLineEdit</name> - <message> - <source>Filter</source> - <translation type="vanished">Фільтр</translation> - </message> - <message> - <source>Clear text</source> - <translation type="vanished">Очистити текст</translation> - </message> -</context> -<context> - <name>Utils::IpAddressLineEdit</name> <message> <source>The IP address is not valid.</source> <translation type="vanished">Неправильна IP адреса.</translation> </message> -</context> -<context> - <name>Utils::LinearProgressWidget</name> <message> <source>...</source> <translation>...</translation> </message> -</context> -<context> - <name>Utils::NewClassWidget</name> <message> <source>&Class name:</source> <translation>Назва &класу:</translation> @@ -20140,9 +20089,6 @@ Will not be applied to whitespace in comments and strings.</source> <source>Inherits QQuickItem - Qt Quick 2</source> <translation>Нащадок QQuickItem - Qt Quick 2</translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>Оберіть...</translation> @@ -20227,9 +20173,6 @@ Will not be applied to whitespace in comments and strings.</source> <source>The path '%1' is not a directory.</source> <translation type="vanished">Шлях '%1' не є текою.</translation> </message> -</context> -<context> - <name>Utils::PathListEditor</name> <message> <source>Insert...</source> <translation>Вставити...</translation> @@ -20250,9 +20193,6 @@ Will not be applied to whitespace in comments and strings.</source> <source>From "%1"</source> <translation type="vanished">З "%1"</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source>Name:</source> <translation>Назва:</translation> @@ -20282,10 +20222,6 @@ Will not be applied to whitespace in comments and strings.</source> <translation>Файл з таким іменем вже існує.</translation> </message> <message> - <source>Name is empty.</source> - <translation>Порожнє ім'я.</translation> - </message> - <message> <source>Name does not match "%1".</source> <translation>Ім'я не збігається з "%1".</translation> </message> @@ -20305,9 +20241,6 @@ Will not be applied to whitespace in comments and strings.</source> <source>Project:</source> <translation>Проект:</translation> </message> -</context> -<context> - <name>Utils::ProjectNameValidatingLineEdit</name> <message> <source>Invalid character '%1' found!</source> <translation type="vanished">Знайдено неправильний символ '%1'!</translation> @@ -20317,23 +20250,13 @@ Will not be applied to whitespace in comments and strings.</source> <translation type="vanished">Знайдено неправильний символ "%1"!</translation> </message> <message> - <source>Invalid character "%1" found.</source> - <translation type="vanished">Знайдено неправильний символ "%1".</translation> - </message> - <message> <source>Invalid character '.'.</source> <translation type="vanished">Неправильний символ '.'.</translation> </message> -</context> -<context> - <name>Utils::QtcProcess</name> <message> <source>Error in command line.</source> <translation>Помилка в командному рядку.</translation> </message> -</context> -<context> - <name>Utils::SynchronousProcess</name> <message> <source>The command '%1' finished successfully.</source> <translation type="vanished">Команда '%1' завершилась успішно.</translation> @@ -20398,9 +20321,6 @@ Will not be applied to whitespace in comments and strings.</source> <source>Would you like to terminate it?</source> <translation>Бажаєте завершити його?</translation> </message> -</context> -<context> - <name>Utils::TextFileFormat</name> <message> <source>Out of memory.</source> <translation>Брак пам'яті.</translation> @@ -20409,32 +20329,15 @@ Will not be applied to whitespace in comments and strings.</source> <source>An encoding error was encountered.</source> <translation>Сталась помилка кодування.</translation> </message> -</context> -<context> - <name>Utils::UnixTools</name> <message> <source><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></source> <translation><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></translation> </message> -</context> -<context> - <name>Utils::WizardPage</name> <message> <source>Choose the Location</source> <translation>Оберіть розташування</translation> </message> <message> - <source>Name:</source> - <translation>Назва:</translation> - </message> - <message> - <source>Path:</source> - <translation>Шлях:</translation> - </message> -</context> -<context> - <name>Utils::fileDeletedPrompt</name> - <message> <source>File has been removed</source> <translation>Файл було видалено</translation> </message> @@ -20462,9 +20365,6 @@ Will not be applied to whitespace in comments and strings.</source> <source>The file %1 was removed. Do you want to save it under a different name, or close the editor?</source> <translation>Файл %1 було видалено. Бажаєте зберегти його під іншим іменем чи закрити редактор?</translation> </message> -</context> -<context> - <name>Utils::reloadPrompt</name> <message> <source>File Changed</source> <translation>Файл змінено</translation> @@ -20474,10 +20374,6 @@ Will not be applied to whitespace in comments and strings.</source> <translation>Незбережений файл <i>%1</i> було змінено поза Qt Creator. Бажаєте перезавантажити його та відкинути ваші зміни?</translation> </message> <message> - <source>&Close</source> - <translation>&Закрити</translation> - </message> - <message> <source>The unsaved file <i>%1</i> has been changed outside Qt Creator. Do you want to reload it and discard your changes?</source> <translation type="vanished">Незбережений файл <i>%1</i> було змінено поза Qt Creator. Бажаєте перезавантажити його та відкинути ваші зміни?</translation> </message> @@ -22701,7 +22597,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> </context> <context> - <name>Utils::SettingsSelector</name> + <name>::Utils</name> <message> <source>Add</source> <translation>Додати</translation> @@ -25043,14 +24939,11 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> </context> <context> - <name>Utils::BaseTreeView</name> + <name>::Utils</name> <message> <source>Adjust Column Widths to Contents</source> <translation type="vanished">Підігнати ширину стовпців до змісту</translation> </message> -</context> -<context> - <name>Utils::ElfReader</name> <message> <source>'%1' is an invalid ELF object (%2)</source> <translation type="vanished">'%1' не є правильним об'єктом ELF (%2)</translation> @@ -31733,7 +31626,7 @@ Partial names can be used if they are unambiguous.</source> </message> </context> <context> - <name>Diff</name> + <name>::Utils</name> <message> <source>Delete</source> <translation>Видалено</translation> @@ -32067,7 +31960,7 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d </message> </context> <context> - <name>QmlJS::QrcParser</name> + <name>::Utils</name> <message> <source>XML error on line %1, col %2: %3</source> <translation>Помилка XML в рядку %1, позиція %2: %3</translation> @@ -34821,7 +34714,7 @@ Please build the qmldump application on the Qt version options page.</source> </message> </context> <context> - <name>Utils::FancyLineEdit</name> + <name>::Utils</name> <message> <source>Filter</source> <translation>Фільтр</translation> @@ -35906,7 +35799,7 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d </message> </context> <context> - <name>Utils::ProxyCredentialsDialog</name> + <name>::Utils</name> <message> <source>Proxy Credentials</source> <translation>Авторизація на проксі-сервері</translation> @@ -36222,11 +36115,7 @@ Are you sure you want to continue?</source> </message> </context> <context> - <name>Utils::FileWizardPage</name> - <message> - <source>Location</source> - <translation>Розташування</translation> - </message> + <name>::Utils</name> </context> <context> <name>::Android</name> @@ -36723,7 +36612,7 @@ Install an SDK of at least API version %1.</source> </message> </context> <context> - <name>Utils::SettingsAccessor</name> + <name>::Utils</name> <message> <source>No Valid Settings Found</source> <translation>Не знайдено правильний налаштувань</translation> @@ -37337,7 +37226,7 @@ Deploying local Qt libraries is incompatible with Android 5.</source> </message> </context> <context> - <name>Utils::MacroExpander</name> + <name>::Utils</name> <message> <source>Infinite recursion error</source> <translation>Помилка нескінченної рекурсії</translation> @@ -39923,13 +39812,6 @@ The files in the Android package source directory are copied to the build direct </message> </context> <context> - <name>Utils::GlobalMacroExpander</name> - <message> - <source>Access environment variables.</source> - <translation type="vanished">Доступ до змінних середовища.</translation> - </message> -</context> -<context> <name>::Core</name> <message> <source>Are you sure you want to delete the theme "%1" permanently?</source> @@ -41497,7 +41379,7 @@ Setting breakpoints by file name and line number may fail.</source> </message> </context> <context> - <name>Utils::ShellCommand</name> + <name>::Utils</name> <message> <source>UNKNOWN</source> <translation>НЕВІДОМО</translation> @@ -41510,9 +41392,6 @@ Setting breakpoints by file name and line number may fail.</source> <source>Error: Executable timed out after %1 s.</source> <translation>Помилка: Час очікування на виконуваний модуль вичерпано після %1 с.</translation> </message> -</context> -<context> - <name>Utils::ShellCommandPage</name> <message> <source>Command started...</source> <translation>Команда запущена...</translation> @@ -42876,7 +42755,7 @@ the program.</source> </message> </context> <context> - <name>Utils::HostOsInfo</name> + <name>::Utils</name> <message> <source>Cannot create OpenGL context.</source> <translation>Неможливо створити контекст OpenGL.</translation> @@ -44572,7 +44451,7 @@ Please set a real Clang executable.</source> </message> </context> <context> - <name>Utils::DebuggerMainWindow</name> + <name>::Utils</name> <message> <source>Views</source> <translation>Види</translation> 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.</source> </message> </context> <context> - <name>Diff</name> + <name>::Utils</name> <message> <source>Delete</source> <translation type="unfinished">删除</translation> @@ -23517,7 +23517,7 @@ Error: %5</source> </message> </context> <context> - <name>JsonTreeModelItem</name> + <name>::Utils</name> <message> <source>Null</source> <translation type="unfinished"></translation> @@ -35986,7 +35986,7 @@ Please build the qmldump application on the Qt version options page.</source> </message> </context> <context> - <name>QmlJS::QrcParser</name> + <name>::Utils</name> <message> <source>XML error on line %1, col %2: %3</source> <translation type="unfinished">XML 错误 在第 %1行, %2列: %3</translation> @@ -41472,7 +41472,7 @@ Failed to open file "%1"</source> </message> </context> <context> - <name>StringUtils</name> + <name>::Utils</name> <message> <source>Elapsed time: %1.</source> <translation type="unfinished"></translation> @@ -45158,7 +45158,7 @@ The trace data is lost.</source> </message> </context> <context> - <name>Utils::Archive</name> + <name>::Utils</name> <message> <source>File format not supported.</source> <translation type="unfinished"></translation> @@ -45179,16 +45179,10 @@ in "%2". <comment>Running <cmd> in <workingdirectory></comment> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::BaseTreeView</name> <message> <source>Show %1 Column</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::CheckableMessageBox</name> <message> <source>Do not ask again</source> <translation>下次不再询问</translation> @@ -45209,9 +45203,6 @@ in "%2". <source>Do not &show again</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::ClassNameValidatingLineEdit</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>类名不能包含命名空间分隔符。</translation> @@ -45224,9 +45215,6 @@ in "%2". <source>The class name contains invalid characters.</source> <translation>类名含有无效字符。</translation> </message> -</context> -<context> - <name>Utils::DebuggerMainWindow</name> <message> <source>Start</source> <translation type="unfinished"></translation> @@ -45235,16 +45223,10 @@ in "%2". <source>Stop</source> <translation type="unfinished">停止</translation> </message> -</context> -<context> - <name>Utils::DetailsButton</name> <message> <source>Details</source> <translation>详情</translation> </message> -</context> -<context> - <name>Utils::ElfReader</name> <message> <source>odd cpu architecture</source> <translation>异常的cpu体系架构</translation> @@ -45287,9 +45269,6 @@ in "%2". <source>odd endianness</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::EnvironmentDialog</name> <message> <source>Edit Environment</source> <translation type="unfinished">编辑时的环境变量</translation> @@ -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 "#".</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::EnvironmentIdAccessor</name> <message> <source>Settings File for "%1" from a Different Environment?</source> <translation type="unfinished"></translation> @@ -45315,16 +45291,6 @@ To disable a variable, prefix the line with "#".</source> <source><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></source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::EnvironmentModel</name> - <message> - <source><VARIABLE></source> - <translation><变量></translation> - </message> -</context> -<context> - <name>Utils::FancyLineEdit</name> <message> <source>Filter</source> <translation type="unfinished">过滤器</translation> @@ -45333,9 +45299,6 @@ To disable a variable, prefix the line with "#".</source> <source>Clear text</source> <translation type="unfinished">清除文字</translation> </message> -</context> -<context> - <name>Utils::FancyMainWindow</name> <message> <source>Reset to Default Layout</source> <translation>重置为默认布局</translation> @@ -45348,9 +45311,6 @@ To disable a variable, prefix the line with "#".</source> <source>Automatically Hide View Title Bars</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> <message> <source>Name is empty.</source> <translation>名称为空。</translation> @@ -45379,16 +45339,6 @@ To disable a variable, prefix the line with "#".</source> <source>Name matches MS Windows device (CON, AUX, PRN, NUL, COM1, COM2, ..., COM9, LPT1, LPT2, ..., LPT9)</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::FileSaverBase</name> - <message> - <source>File Error</source> - <translation type="unfinished">文件错误</translation> - </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -45413,9 +45363,6 @@ To disable a variable, prefix the line with "#".</source> <source>List of comma separated wildcard filters. Files with file name or full file path matching any filter are included.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::FileSystemModel</name> <message> <source>My Computer</source> <translation type="unfinished"></translation> @@ -45446,9 +45393,6 @@ To disable a variable, prefix the line with "#".</source> <source>Date Modified</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::FileUtils</name> <message> <source>Refusing to remove root directory.</source> <translation>拒绝移除根目录(root)。</translation> @@ -45531,9 +45475,6 @@ To disable a variable, prefix the line with "#".</source> <source>Failed to create directory "%1".</source> <translation type="unfinished">创建目录失败:'%1'。</translation> </message> -</context> -<context> - <name>Utils::FileWizardPage</name> <message> <source>Choose the Location</source> <translation type="unfinished">选择位置</translation> @@ -45543,10 +45484,6 @@ To disable a variable, prefix the line with "#".</source> <translation type="unfinished">文件名:</translation> </message> <message> - <source>Path:</source> - <translation type="unfinished">路径:</translation> - </message> - <message> <source>Location</source> <translation type="unfinished"></translation> </message> @@ -45554,16 +45491,10 @@ To disable a variable, prefix the line with "#".</source> <source>The default suffix if you do not explicitly specify a file extension is ".%1".</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::HostOsInfo</name> <message> <source>Cannot create OpenGL context.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::InfoBarDisplay</name> <message> <source>&Show Details</source> <translation type="unfinished"></translation> @@ -45576,16 +45507,10 @@ To disable a variable, prefix the line with "#".</source> <source>Close</source> <translation type="unfinished">关闭</translation> </message> -</context> -<context> - <name>Utils::LauncherHandle</name> <message> <source>Process launcher socket error.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::LauncherSocket</name> <message> <source>Failed to start process launcher at "%1": %2</source> <translation type="unfinished"></translation> @@ -45610,16 +45535,10 @@ To disable a variable, prefix the line with "#".</source> <source>Launcher socket closed unexpectedly.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::LinearProgressWidget</name> <message> <source>...</source> <translation>...</translation> </message> -</context> -<context> - <name>Utils::MacroExpander</name> <message> <source>Infinite recursion error</source> <translation type="unfinished"></translation> @@ -45656,16 +45575,10 @@ To disable a variable, prefix the line with "#".</source> <source>Access environment variables.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::MinimizableInfoBars</name> <message> <source>Minimize</source> <translation type="unfinished">最小化</translation> </message> -</context> -<context> - <name>Utils::NameValueModel</name> <message> <source><UNSET></source> <translation type="unfinished"><未设定></translation> @@ -45681,16 +45594,13 @@ To disable a variable, prefix the line with "#".</source> <message> <source><VARIABLE></source> <extracomment>Name when inserting a new variable</extracomment> - <translation type="unfinished"><变量></translation> + <translation><变量></translation> </message> <message> <source><VALUE></source> <extracomment>Value when inserting a new variable</extracomment> <translation type="unfinished"><值></translation> </message> -</context> -<context> - <name>Utils::NameValuesDialog</name> <message> <source>&OK</source> <translation type="unfinished"></translation> @@ -45699,9 +45609,6 @@ To disable a variable, prefix the line with "#".</source> <source>&Cancel</source> <translation type="unfinished">取消(&C)</translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>选择...</translation> @@ -45766,9 +45673,6 @@ To disable a variable, prefix the line with "#".</source> <source>Full path: "%1"</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::PathListEditor</name> <message> <source>Insert...</source> <translation>插入...</translation> @@ -45781,9 +45685,6 @@ To disable a variable, prefix the line with "#".</source> <source>Clear</source> <translation>清除</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source>The project already exists.</source> <translation>项目已经存在。</translation> @@ -45813,14 +45714,6 @@ To disable a variable, prefix the line with "#".</source> <translation type="unfinished"></translation> </message> <message> - <source>Location</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Name is empty.</source> - <translation type="unfinished">名称为空。</translation> - </message> - <message> <source>Project name is invalid.</source> <translation type="unfinished"></translation> </message> @@ -45832,9 +45725,6 @@ To disable a variable, prefix the line with "#".</source> <source>Invalid character "%1" found.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::ProxyCredentialsDialog</name> <message> <source>Proxy Credentials</source> <translation type="unfinished"></translation> @@ -45859,9 +45749,6 @@ To disable a variable, prefix the line with "#".</source> <source>Password</source> <translation type="unfinished">密码</translation> </message> -</context> -<context> - <name>Utils::QtcProcess</name> <message> <source>Error in command line.</source> <translation>命令行发生错误。</translation> @@ -45982,9 +45869,6 @@ To disable a variable, prefix the line with "#".</source> <source>Invalid command</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::RemoveFileDialog</name> <message> <source>Remove File</source> <translation type="unfinished">删除文件</translation> @@ -46009,9 +45893,6 @@ To disable a variable, prefix the line with "#".</source> <source>Folder to remove:</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::SettingsAccessor</name> <message> <source>Failed to Read File</source> <translation type="unfinished"></translation> @@ -46056,9 +45937,6 @@ To disable a variable, prefix the line with "#".</source> <source>"%1" is not supported by %2. Do you want to try loading it anyway?</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::SettingsSelector</name> <message> <source>Add</source> <translation>添加</translation> @@ -46083,16 +45961,10 @@ To disable a variable, prefix the line with "#".</source> <source>Rename...</source> <translation>重命名...</translation> </message> -</context> -<context> - <name>Utils::StringAspect</name> <message> <source>Reset</source> <translation type="unfinished">重置</translation> </message> -</context> -<context> - <name>Utils::TextFileFormat</name> <message> <source>Out of memory.</source> <translation>内存不足。</translation> @@ -46101,9 +45973,6 @@ To disable a variable, prefix the line with "#".</source> <source>An encoding error was encountered.</source> <translation>发生了一个编码错误。</translation> </message> -</context> -<context> - <name>Utils::TriStateAspect</name> <message> <source>Enable</source> <translation type="unfinished"></translation> @@ -46116,16 +45985,10 @@ To disable a variable, prefix the line with "#".</source> <source>Leave at Default</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::UnixTools</name> <message> <source><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></source> <translation><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></translation> </message> -</context> -<context> - <name>Utils::VariableChooser</name> <message> <source>Insert Variable</source> <translation type="unfinished"></translation> @@ -46154,9 +46017,6 @@ To disable a variable, prefix the line with "#".</source> <source>Variables</source> <translation type="unfinished">变量</translation> </message> -</context> -<context> - <name>Utils::fileDeletedPrompt</name> <message> <source>&Close</source> <translation>关闭(&C)</translation> @@ -46181,9 +46041,6 @@ To disable a variable, prefix the line with "#".</source> <source>C&lose All</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::reloadPrompt</name> <message> <source>File Changed</source> <translation>文件已改变</translation> @@ -46206,10 +46063,6 @@ To disable a variable, prefix the line with "#".</source> <translation type="unfinished"></translation> </message> <message> - <source>&Close</source> - <translation type="unfinished"></translation> - </message> - <message> <source>No to All && &Diff</source> <translation type="unfinished"></translation> </message> 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 @@ </message> </context> <context> - <name>Utils::ClassNameValidatingLineEdit</name> + <name>::Utils</name> <message> <source>The class name must not contain namespace delimiters.</source> <translation>類別名稱不能包含命名空間分隔符。</translation> @@ -1221,9 +1221,6 @@ <source>The class name contains invalid characters.</source> <translation>類別名稱中含有無效字元。</translation> </message> -</context> -<context> - <name>Utils::ConsoleProcess</name> <message> <source>Cannot set up communication channel: %1</source> <translation>無法設定通訊頻道：%1</translation> @@ -1292,9 +1289,6 @@ <source>Cannot create socket '%1': %2</source> <translation>無法建立 socket '%1'：%2</translation> </message> -</context> -<context> - <name>Utils::FileNameValidatingLineEdit</name> <message> <source>Name is empty.</source> <translation>名稱是空的。</translation> @@ -1323,9 +1317,6 @@ <source>File extensions %1 are required:</source> <translation>需要副檔名 %1：</translation> </message> -</context> -<context> - <name>Utils::FileSearch</name> <message numerus="yes"> <source>%1: canceled. %n occurrences found in %2 files.</source> <translation> @@ -1344,9 +1335,6 @@ <numerusform>%1：在 %3 個檔案中的 %2 個找到了 %n 個結果。</numerusform> </translation> </message> -</context> -<context> - <name>Utils::NewClassWidget</name> <message> <source>Invalid base class name</source> <translation>無效的基礎類別名稱</translation> @@ -1415,9 +1403,6 @@ <source>Inherits QDeclarativeItem</source> <translation>繼承自 QDeclarativeItem</translation> </message> -</context> -<context> - <name>Utils::PathChooser</name> <message> <source>Choose...</source> <translation>選擇...</translation> @@ -1478,9 +1463,6 @@ <source>Path:</source> <translation>路徑：</translation> </message> -</context> -<context> - <name>Utils::PathListEditor</name> <message> <source>Insert...</source> <translation>插入...</translation> @@ -1501,9 +1483,6 @@ <source>From "%1"</source> <translation>從 "%1"</translation> </message> -</context> -<context> - <name>Utils::ProjectIntroPage</name> <message> <source><Enter_Name></source> <translation><輸入名稱></translation> @@ -1536,16 +1515,10 @@ <source>Project:</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::ProjectNameValidatingLineEdit</name> <message> <source>Invalid character '.'.</source> <translation>無效字元 '.'。</translation> </message> -</context> -<context> - <name>Utils::SubmitEditorWidget</name> <message> <source>Subversion Submit</source> <translation>Subversion 提交</translation> @@ -1582,24 +1555,10 @@ <source>Check a&ll</source> <translation>全部勾選(&L)</translation> </message> -</context> -<context> - <name>Utils::WizardPage</name> - <message> - <source>Name:</source> - <translation>名稱：</translation> - </message> - <message> - <source>Path:</source> - <translation>路徑：</translation> - </message> <message> <source>Choose the Location</source> <translation>選擇位置</translation> </message> -</context> -<context> - <name>Utils::reloadPrompt</name> <message> <source>File Changed</source> <translation>檔案已變更</translation> @@ -9594,7 +9553,7 @@ Will not be applied to whitespace in comments and strings.</source> </message> </context> <context> - <name>Utils::CheckableMessageBox</name> + <name>::Utils</name> <message> <source>Do not ask again</source> <translation>不要再次詢問</translation> @@ -10061,7 +10020,7 @@ Will not be applied to whitespace in comments and strings.</source> </message> </context> <context> - <name>Utils::DetailsButton</name> + <name>::Utils</name> <message> <source>Details</source> <translation>詳情</translation> @@ -12105,14 +12064,11 @@ For qmlproject projects, use the importPaths property to add import paths.</sour </message> </context> <context> - <name>Utils::FileWizardDialog</name> + <name>::Utils</name> <message> <source>Location</source> <translation>位置</translation> </message> -</context> -<context> - <name>Utils::FilterLineEdit</name> <message> <source>Filter</source> <translation>過濾器</translation> @@ -12121,9 +12077,6 @@ For qmlproject projects, use the importPaths property to add import paths.</sour <source>Clear text</source> <translation>清除文字</translation> </message> -</context> -<context> - <name>Utils::fileDeletedPrompt</name> <message> <source>File has been removed</source> <translation>檔案已經被移除</translation> @@ -12148,16 +12101,10 @@ For qmlproject projects, use the importPaths property to add import paths.</sour <source>&Save</source> <translation>儲存(&S)</translation> </message> -</context> -<context> - <name>Utils::UnixTools</name> <message> <source><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></source> <translation><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></translation> </message> -</context> -<context> - <name>Utils::LinearProgressWidget</name> <message> <source>...</source> <translation>...</translation> @@ -13863,7 +13810,7 @@ Requires <b>Qt 4.7.4</b> or newer.</source> </message> </context> <context> - <name>Utils::FancyMainWindow</name> + <name>::Utils</name> <message> <source>Locked</source> <translation>已鎖定</translation> @@ -15156,7 +15103,7 @@ Ids must begin with a lowercase letter.</source> </message> </context> <context> - <name>Utils::SynchronousProcess</name> + <name>::Utils</name> <message> <source>The command '%1' finished successfully.</source> <translation>指令 '%1' 已成功完成。</translation> @@ -17583,7 +17530,7 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Utils::EnvironmentModel</name> + <name>::Utils</name> <message> <source><UNSET></source> <translation><未設定></translation> @@ -17606,23 +17553,14 @@ Local pulls are not applied to the master branch.</source> <extracomment>Value when inserting a new variable</extracomment> <translation><值></translation> </message> -</context> -<context> - <name>Utils::IpAddressLineEdit</name> <message> <source>The IP address is not valid.</source> <translation>不是一個合法的 IP 位址。</translation> </message> -</context> -<context> - <name>Utils::QtcProcess</name> <message> <source>Error in command line.</source> <translation>命令列發生錯誤。</translation> </message> -</context> -<context> - <name>Utils::Internal::SftpChannelPrivate</name> <message> <source>Server could not start sftp subsystem.</source> <translation type="obsolete">伺服器無法啟動 sftp 子系統。</translation> @@ -17703,16 +17641,10 @@ Local pulls are not applied to the master branch.</source> <source>Error reading local file: %1</source> <translation type="obsolete">讀取本地檔案時發生錯誤：%1</translation> </message> -</context> -<context> - <name>Utils::Internal::SshChannelManager</name> <message> <source>Invalid channel id %1</source> <translation type="obsolete">無效的頻道代碼 %1</translation> </message> -</context> -<context> - <name>Utils::Internal::SshConnectionPrivate</name> <message> <source>SSH Protocol error: %1</source> <translation type="obsolete">SSH 協定錯誤：%1</translation> @@ -17730,10 +17662,6 @@ Local pulls are not applied to the master branch.</source> <translation type="obsolete">無效的伺服器代碼 '%1'。</translation> </message> <message> - <source>Unexpected packet of type %1.</source> - <translation type="obsolete">未預期的封包型態 %1。</translation> - </message> - <message> <source>Password expired.</source> <translation type="obsolete">密碼已過期。</translation> </message> @@ -20995,7 +20923,7 @@ With cache simulation, further event counters are enabled: </message> </context> <context> - <name>Utils::FileUtils</name> + <name>::Utils</name> <message> <source>Refusing to remove root directory.</source> <translation>拒絕移除根目錄。</translation> @@ -23611,7 +23539,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi </message> </context> <context> - <name>Utils::Ssh</name> + <name>::Utils</name> <message> <source>Password Required</source> <translation type="obsolete">需要密碼</translation> @@ -23620,9 +23548,6 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi <source>Please enter the password for your private key.</source> <translation type="obsolete">美請輸入您的私密金鑰的密碼。</translation> </message> -</context> -<context> - <name>Utils::TextFileFormat</name> <message> <source>Out of memory.</source> <translation>記憶體不足。</translation> @@ -26631,7 +26556,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> </context> <context> - <name>Utils::SettingsSelector</name> + <name>::Utils</name> <message> <source>Add</source> <translation>新增</translation> @@ -26656,9 +26581,6 @@ should a repository require SSH-authentication (see documentation on SSH and the <source>Rename...</source> <translation>重新命名...</translation> </message> -</context> -<context> - <name>Utils::SftpFileSystemModel</name> <message> <source>File Type</source> <translation type="obsolete">檔案型態</translation> @@ -26675,9 +26597,6 @@ should a repository require SSH-authentication (see documentation on SSH and the <source>Error listing contents of directory '%1': %2</source> <translation type="obsolete">列出目錄 '%1' 的內容時發生錯誤：%2</translation> </message> -</context> -<context> - <name>Utils::Internal::SshRemoteProcessPrivate</name> <message> <source>Process killed by signal</source> <translation type="obsolete">行程被信號強行中止</translation> @@ -28550,14 +28469,11 @@ This option is useful when you want to try your application on devices which don </message> </context> <context> - <name>Utils::BaseTreeView</name> + <name>::Utils</name> <message> <source>Adjust Column Widths to Contents</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Utils::ElfReader</name> <message> <source>'%1' is an invalid ELF object (%2)</source> <translation type="unfinished"></translation> 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 <QSettings> @@ -120,7 +121,7 @@ bool Archive::supportsFile(const FilePath &filePath, QString *reason) const QVector<Tool> 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<QStringList>(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 <cmd> in <workingdirectory>") + emit outputReceived(Tr::tr("Running %1\nin \"%2\".\n\n", "Running <cmd> in <workingdirectory>") .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<QPushButton>(tr("Reset")); + auto resetButton = createSubWidget<QPushButton>(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 <functional> #include <memory> @@ -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 <QDebug> #include <QFontMetrics> @@ -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 <QApplication> #include <QCheckBox> @@ -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 <QRegularExpression> @@ -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 <utils/hostosinfo.h> -#include <utils/icon.h> -#include <utils/stylehelper.h> +#include "hostosinfo.h" +#include "icon.h" +#include "stylehelper.h" +#include "utilstr.h" #include <QGraphicsOpacityEffect> #include <QGuiApplication> @@ -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 <QList> #include <QRegularExpression> #include <QStringList> #include <QMap> #include <QPair> -#include <QCoreApplication> #include <QFutureInterfaceBase> 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 <QDir> #include <QtEndian> @@ -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<EnvironmentItems> 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 <QKeyEvent> #include <QKeySequence> @@ -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 <QAbstractButton> #include <QApplication> @@ -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 <QRegularExpression> @@ -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 <QCoreApplication> #include <QLoggingCategory> #include <QMutex> #include <QRegularExpression> @@ -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 <QDateTime> #include <QCollator> @@ -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<T()> &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 <QCoreApplication> +#include "utilstr.h" #if !defined(QT_NO_OPENGL) && defined(QT_GUI_LIB) #include <QOpenGLContext> @@ -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 <QComboBox> #include <QHBoxLayout> @@ -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 <QJsonArray> #include <QJsonObject> @@ -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<JsonTreeItem> { - 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 <QCoreApplication> #include <QDebug> #include <QDir> #include <QLocalServer> @@ -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 <QCoreApplication> #include <QLocalSocket> #include <QMutexLocker> @@ -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<int>(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 <QDir> #include <QFileInfo> @@ -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<MacroExpanderProvider>; 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 <QAction> #include <QToolButton> @@ -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 <QFileInfo> #include <QFont> @@ -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("<UNSET>")); + m_resultNameValueDictionary.set(item.name, Tr::tr("<UNSET>")); } } @@ -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("<VARIABLE>"), + return addVariable(NameValueItem(Tr::tr("<VARIABLE>"), //: Value when inserting a new variable - tr("<VALUE>"))); + Tr::tr("<VALUE>"))); } 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 <QDialogButtonBox> #include <QLabel> @@ -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 <QMimeData> #include <QPlainTextEdit> @@ -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 <QCoreApplication> #include <QDateTime> #include <QDebug> #include <QDir> @@ -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 <QApplication> @@ -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 <utils/filepath.h> +#include <qmljs/qmljstr.h> // Yes, the translations are still there #include <QCoreApplication> #include <QDir> @@ -26,7 +27,6 @@ namespace Internal { class QrcParserPrivate { - Q_DECLARE_TR_FUNCTIONS(QmlJS::QrcParser) public: typedef QMap<QString,QStringList> 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 <RCC> root element is missing.")); + m_errorMessages.append(QmlJS::Tr::tr("The <RCC> 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 <QCoreApplication> #include <QDebug> @@ -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 <QDir> #include <QGuiApplication> @@ -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 <i>%1</i> has been changed on disk. " - "Do you want to reload it and discard your changes?"); + msg = Tr::tr("The unsaved file <i>%1</i> has been changed on disk. " + "Do you want to reload it and discard your changes?"); } else { - msg = QCoreApplication::translate("Utils::reloadPrompt", - "The file <i>%1</i> has been changed on disk. Do you want to reload it?"); + msg = Tr::tr("The file <i>%1</i> has been changed on disk. Do you want to reload it?"); } msg = "<p>" + msg.arg(fileName.fileName()) + "</p><p>"; 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 += "</p>"; 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 <QApplication> #include <QCheckBox> @@ -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 <QApplication> #include <QDir> 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::Issue> 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::Issue> SettingsAccessor::writeFile(const FilePat m_writer = std::make_unique<PersistentSettingsWriter>(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", - "<p>No valid settings file could be found.</p>" - "<p>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.</p>") + Issue i(Tr::tr("No Valid Settings Found"), + Tr::tr("<p>No valid settings file could be found.</p>" + "<p>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.</p>") .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", - "<p>No valid settings file could be found.</p>" - "<p>All settings files found in directory \"%1\" " - "were either too new or too old to be read.</p>") + Issue i(Tr::tr("No Valid Settings Found"), + Tr::tr("<p>No valid settings file could be found.</p>" + "<p>All settings files found in directory \"%1\" " + "were either too new or too old to be read.</p>") .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", - "<p>The versioned backup \"%1\" of the settings " - "file is used, because the non-versioned file was " - "created by an incompatible version of %2.</p>" - "<p>Settings changes made since the last time this " - "version of %2 was used are ignored, and " - "changes made now will <b>not</b> be propagated to " - "the newer version.</p>") + Issue i(Tr::tr("Using Old Settings"), + Tr::tr("<p>The versioned backup \"%1\" of the settings " + "file is used, because the non-versioned file was " + "created by an incompatible version of %2.</p>" + "<p>Settings changes made since the last time this " + "version of %2 was used are ignored, and " + "changes made now will <b>not</b> be propagated to " + "the newer version.</p>") .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", - "<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>") + Tr::tr("<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>") .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 <QComboBox> #include <QHBoxLayout> #include <QInputDialog> @@ -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 <b>%1</b>?") + const QString title = Tr::tr("Remove"); + const QString message = Tr::tr("Do you really want to delete the configuration <b>%1</b>?") .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 <b>%1</b>:").arg(baseName); + const QString message = Tr::tr("New name for configuration <b>%1</b>:").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 <QApplication> #include <QClipboard> #endif -#include <QCoreApplication> #include <QDir> #include <QJsonArray> #include <QJsonValue> @@ -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 <QCoreApplication> #include <QLocalServer> @@ -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 <RETURN> to close this window..."); + return Tr::tr("Press <RETURN> 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 <QDebug> #include <QTextCodec> @@ -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 <QCoreApplication> #include <QFileInfo> #include <QSettings> @@ -33,14 +33,13 @@ void UnixUtils::setFileBrowser(QSettings *settings, const QString &term) QString UnixUtils::fileBrowserHelpText() { - QString help = QCoreApplication::translate("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>"); + QString help = Tr::tr("<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>"); 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 <QApplication> #include <QHeaderView> @@ -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("<p>") - + 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 <QDebug> @@ -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); |