diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index c47ed608d55..365cc091d37 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -8698,7 +8698,7 @@ Commit now? - Help::Internal::CentralWidget + Help Add new page Přidat novou stranu @@ -8727,9 +8727,6 @@ Commit now? Add Bookmark for this Page... Přidat záložku pro tuto stranu... - - - Help::Internal::DocSettingsPage Documentation Dokumentace @@ -8786,9 +8783,6 @@ Commit now? Remove Odstranit - - - Help::Internal::FilterSettingsPage Filters Filtry @@ -8813,10 +8807,6 @@ Commit now? The filter "%1" will only show documentation files that have the attributes %2 specified. Filtr "%1" ukáže pouze ty soubory s dokumentací, které mají zadány vlastnosti %2. - - Help - Nápověda - <html><body> <p> @@ -8839,10 +8829,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur Add Přidat - - Remove - Odstranit - <html><body> <p> @@ -8853,13 +8839,6 @@ Add, modify, and remove document filters, which determine the documentation set Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy určují zobrazenou dokumentaci. Vlastnosti jsou popsány v dokumentech. Vyberte filtry, aby se zobrazila sada související dokumentace. Všimněte si, že některé vlastnosti jsou popsány ve více dokumentech. </p></body></html> - - Add... - Přidat... - - - - Help::Internal::HelpIndexFilter Help index Rejstřík pro nápovědu @@ -8868,16 +8847,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur Help Index Rejstřík pro nápovědu - - - Help::Internal::HelpMode - - Help - Nápověda - - - - Help::Internal::HelpPlugin Contents Obsah @@ -9054,10 +9023,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur Show Sidebar Ukázat postranní panel - - Unfiltered - Žádný filtr - No Documentation Dokumentace chybí @@ -9078,9 +9043,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur Hide Sidebar Skrýt postranní panel - - - Help::Internal::SearchWidget &Copy &Kopírovat @@ -9089,10 +9051,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur Copy &Link Location &Kopírovat adresu odkazu - - Open Link in New Tab - Otevřít odkaz v nové kartě - Select All Vybrat vše @@ -9125,9 +9083,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur Reload Nahrát znovu - - - HelpViewer Open Link in New Tab Otevřít odkaz v nové kartě @@ -9144,10 +9099,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Chyba 404 ...</title><div align="center"><br><br><h1>Stranu se nepodařilo najít.</h1><br><h3>'%1'</h3></div> - - Help - Nápověda - Unable to launch external application. @@ -9158,10 +9109,6 @@ Přidat, upravit a odstranit dokumentové filtry, které v režimu nápovědy ur OK OK - - Copy &Link Location - &Kopírovat adresu odkazu - Open Link in New Tab Ctrl+LMB Otevřít odkaz v nové kartě Ctrl+LMB @@ -19723,15 +19670,11 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás - Help::Internal::GeneralSettingsPage + Help General settings Obecná nastavení - - Help - Nápověda - General Settings Obecná nastavení @@ -19888,9 +19831,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás Switches to editor context after last help page is closed. Přepne do editoru po zavření poslední stránky s nápovědou. - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. Soubor není souborem XBEL ve verzi 1.0. @@ -25576,41 +25516,10 @@ Proces Pdb po určité době od úspěšného spuštění spadl. Help - - Help - Nápověda - - - - Help::Internal::HelpViewer - - <title>about:blank</title> - <title>about:blank</title> - <html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Error 404...</title></head><body><div align="center"><br/><br/><h1>The page could not be found</h1><br/><h3>'%1'</h3></div></body></html> <html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Error 404...</title></head><body><div align="center"><br/><br/><h1>Stránku se nepodařilo najít</h1><br/><h3>'%1'</h3></div></body></html> - - Open Link - Otevřít adresu odkazu - - - Open Link as New Page - Otevřít adresu odkazu jako novou stránku - - - Copy Link - Kopírovat odkaz - - - Copy - Kopírovat - - - Reload - Nahrát znovu - Error loading: %1 Chyba při nahrávání: %1 @@ -25619,16 +25528,10 @@ Proces Pdb po určité době od úspěšného spuštění spadl. Unknown or unsupported Content! Neznámý nebo nepodporovaný obsah! - - - Help::Internal::OpenPagesModel (Untitled) (Bez názvu) - - - Help::Internal::OpenPagesWidget Close %1 Zavřít %1 @@ -30924,7 +30827,7 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap - Help::Internal::RemoteFilterOptions + Help Filter configuration Nastavení filtru @@ -30937,14 +30840,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap Limit to prefix Omezit na předponu - - Add - Přidat - - - Remove - Odstranit - Double-click to edit item. Dvojité klepnutí pro úpravu položky. @@ -36500,25 +36395,15 @@ když bude zavolán mimo git bash. - Help::Internal::ExternalHelpWindow - - Show Sidebar - Ukázat postranní panel - + Help Qt Creator Offline Help Nápověda pro Qt Creator - - - Help::Internal::OpenPagesManager Copy Full Path to Clipboard Kopírovat celou cestu do schránky - - - Help::Internal::RemoteHelpFilter Web Search Hledat na internetu diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 78b18c3eb1b..9b2b34d78c6 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -19351,9 +19351,6 @@ Lad være tom for at gennemsøge filsystemet. The page could not be found Siden kunne ikke findes - - - Help::Internal::DocSettingsPage Add and remove compressed help files, .qch. Tilføj og fjern komprimeret hjælp-filer, .qch. @@ -19402,9 +19399,6 @@ Lad være tom for at gennemsøge filsystemet. Unable to register documentation. Kunne ikke registrere dokumentation. - - - Help::Internal::FilterSettingsPage <html><body> <p> @@ -19431,14 +19425,6 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt No user defined filters available or no filter selected. Ingen brugerdefineret filtre tilgængelige eller intet filter valgt. - - Add... - Tilføj... - - - Remove - Fjern - Unfiltered Ufiltreret @@ -19455,9 +19441,6 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt The filter "%1" will only show documentation files that have the attributes %2 specified. Filteret "%1" vil kun vise dokumentationsfiler som har angivet attributterne %2. - - - Help::Internal::GeneralSettingsPage Font Skrifttype @@ -19578,23 +19561,10 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt Save File Gem fil - - - Help::Internal::HelpIndexFilter Help Index Hjælp-indeks - - - Help::Internal::HelpMode - - Help - Hjælp - - - - Help::Internal::HelpPlugin Index Indeks @@ -19631,10 +19601,6 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt System Information... Systeminformation... - - Unfiltered - Ufiltreret - No Documentation Ingen dokumentation @@ -19655,9 +19621,6 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt Copy to Clipboard Kopiér til udklipsholder - - - Help::Internal::HelpWidget Open in Help Mode Åbn i Hjælp-tilstand @@ -19758,10 +19721,6 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt Ctrl+Shift+O Ctrl+Skift+O - - Help - Hjælp - Help - %1 Hjælp - %1 @@ -19770,9 +19729,6 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt Print Documentation Udskriv dokumentation - - - Help::Internal::IndexWindow &Look for: &Led efter: @@ -19785,23 +19741,14 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt Open Link as New Page Åbn link som ny side - - - Help::Internal::OpenPagesManager Copy Full Path to Clipboard Kopiér fulde sti til udklipsholder - - - Help::Internal::OpenPagesModel (Untitled) (unavngivet) - - - Help::Internal::OpenPagesWidget Close %1 Luk %1 @@ -19810,17 +19757,10 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt Close All Except %1 Luk alle, undtagen %1 - - - Help::Internal::RemoteFilterOptions Add Tilføj - - Remove - Fjern - Double-click to edit item. Dobbeltklik for at redigere post. @@ -19833,42 +19773,22 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt Move Down Flyt ned - - - Help::Internal::RemoteHelpFilter Web Search Websøgning - - - Help::Internal::SearchSideBarItem Regenerate Index Regenerer indeks - - - Help::Internal::SearchTaskHandler Get Help Online Få hjælp online - - - Help::Internal::SearchWidget Indexing Documentation Indekserer dokumentation - - Open Link - Åbn link - - - Open Link as New Page - Åbn link som ny side - Copy Link Kopiér link @@ -19881,28 +19801,6 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt Reload Genindlæs - - - Help::Internal::TextBrowserHelpWidget - - Open Link - Åbn link - - - Copy Link - Kopiér link - - - Copy - Kopiér - - - Reload - Genindlæs - - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. Filen er ikke en XBEL version 1.0-fil. @@ -19911,13 +19809,6 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt Unknown title Ukendt titel - - - HelpViewer - - Open Link as New Page - Åbn link som ny side - Open Link in Window Åbn link i vindue diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 8773c98379a..f408279eb13 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -4864,7 +4864,7 @@ Jetzt Commit ausführen? - Help::Internal::DocSettingsPage + Help Add and remove compressed help files, .qch. Hinzufügen oder Entfernen von komprimierten Hilfedateien (.qch). @@ -4881,9 +4881,6 @@ Jetzt Commit ausführen? Remove Entfernen - - - Help::Internal::FilterSettingsPage Filters Filter @@ -4916,10 +4913,6 @@ Jetzt Commit ausführen? 1 1 - - Remove - Entfernen - <html><body> <p> @@ -4927,13 +4920,6 @@ Add, modify, and remove document filters, which determine the documentation set </p></body></html> <html><body><p>Hinzufügen, Ändern oder Entfernen von Dokumentenfiltern, die die im Hilfsmodus angezeigte Dokumentation festlegen. Die Attribute sind in den Dokumenten definiert. Durch die Angabe der Attribute kann die relevante Dokumentation ausgewählt werden. Beachten Sie, dass einige Attribute in mehreren Dokumenten erscheinen.</p></body></html> - - Add... - Hinzufügen... - - - - Help::Internal::GeneralSettingsPage General Allgemein @@ -5071,23 +5057,14 @@ Add, modify, and remove document filters, which determine the documentation set Viewer backend: Anzeigen mit: - - - Help::Internal::HelpIndexFilter Help Index Hilfe - Index - - - Help::Internal::HelpMode Help Hilfe - - - Help::Internal::HelpPlugin Search Suche @@ -5144,13 +5121,6 @@ Add, modify, and remove document filters, which determine the documentation set Copy to Clipboard In die Zwischenablage kopieren - - Unfiltered - Kein - - - - Help::Internal::SearchWidget Indexing Documentation Indiziere Dokumentation @@ -5175,9 +5145,6 @@ Add, modify, and remove document filters, which determine the documentation set Reload Neu laden - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. Die Datei ist keine XBEL-Datei der Version 1.0. @@ -9306,10 +9273,6 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen. Help - - Help - Hilfe - Error loading page Fehler beim Laden der Seite @@ -10688,7 +10651,7 @@ Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMa - Help::Internal::OpenPagesWidget + Help Close %1 Schließe %1 @@ -11733,7 +11696,7 @@ wenn es außerhalb von git bash aufgerufen wird. - Help::Internal::OpenPagesManager + Help Copy Full Path to Clipboard Vollständigen Pfad in die Zwischenablage kopieren @@ -27823,7 +27786,7 @@ Bitte installieren Sie ein Android-SDK der API-Version %1 oder neuer. - Help::Internal::HelpWidget + Help (Untitled) (Ohne Titel) @@ -27900,14 +27863,6 @@ Bitte installieren Sie ein Android-SDK der API-Version %1 oder neuer.Open in Window In Fenster öffnen - - Reload - Neu laden - - - Unfiltered - Ungefiltert - Meta+Shift+C Meta+Shift+C @@ -27960,10 +27915,6 @@ Bitte installieren Sie ein Android-SDK der API-Version %1 oder neuer.Ctrl+Shift+O Ctrl+Shift+O - - Help - Hilfe - Help - %1 Hilfe - %1 @@ -27972,36 +27923,15 @@ Bitte installieren Sie ein Android-SDK der API-Version %1 oder neuer.Print Documentation Dokumentation drucken - - - Help::Internal::SearchTaskHandler Get Help Online Onlinehilfe - - - Help::Internal::SearchSideBarItem Regenerate Index Index neu erstellen - - Help::Internal::TextBrowserHelpWidget - - Open Link - Verweis öffnen - - - Copy Link - Verweis kopieren - - - Copy - Kopieren - - ProjectWizard @@ -31010,11 +30940,7 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü - HelpViewer - - Open Link as New Page - Verweis in neuer Seite öffnen - + Help Open Link in Window Verweis in Fenster öffnen @@ -31517,19 +31443,11 @@ konnte dem Projekt "%2" nicht hinzugefügt werden. - Help::Internal::IndexWindow + Help &Look for: &Suche nach: - - Open Link - Verweis öffnen - - - Open Link as New Page - Verweis in neuer Seite öffnen - RowLabel @@ -43358,7 +43276,7 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni - Help::Internal::HelpManager + Help Update Documentation Dokumentation aktualisieren @@ -48116,18 +48034,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - Help::Internal::LiteHtmlHelpViewer - - Copy Link - Verweis kopieren - - - Copy - Kopieren - - - - Help::Internal::LocalHelpManager + Help QtWebEngine QtWebEngine @@ -49347,7 +49254,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - Help::DocSettingsPageWidget + Help %1 (auto-detected) %1 (automatisch bestimmt) diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index 43cc7231e67..b06d6bacb79 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -6000,7 +6000,7 @@ Razón: %3 - Help::Internal::CentralWidget + Help Add new page Agregar nueva página @@ -6029,9 +6029,6 @@ Razón: %3 Add Bookmark for this Page... Añadir marcador para ésta página... - - - Help::Internal::DocSettingsPage Documentation Documentación @@ -6056,9 +6053,6 @@ Razón: %3 Cannot unregister documentation file %1! No se puede desregistrar el archivo de documentación %1! - - - Help::Internal::FilterSettingsPage Filters Filtros @@ -6067,23 +6061,14 @@ Razón: %3 Help Ayuda - - - Help::Internal::HelpIndexFilter Help index Índice de la ayuda - - - Help::Internal::HelpMode Help Ayuda - - - Help::Internal::HelpPlugin Contents Contenidos @@ -6180,9 +6165,6 @@ Razón: %3 Filtered by: Filtrado por: - - - Help::Internal::SearchWidget &Copy &Copiar @@ -6199,9 +6181,6 @@ Razón: %3 Select All Seleccionar todo - - - Help::Internal::TitleMapThread Documentation file %1 does not exist! Skipping file. @@ -13028,7 +13007,7 @@ p, li { white-space: pre-wrap; } - Help::Internal::GeneralSettingsPage + Help General settings Ajustes generales @@ -13053,9 +13032,6 @@ p, li { white-space: pre-wrap; } Save File - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 58d365107d7..e823e2f3444 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -9429,7 +9429,7 @@ Valider maintenant ? - Help::Internal::CentralWidget + Help Add new page Ajouter une nouvelle page @@ -9458,17 +9458,10 @@ Valider maintenant ? Add Bookmark for this Page... Ajouter un signet pour cette page... - - - Help::Internal::DocSettingsPage Documentation Documentation - - Help - Aide - Add Documentation Ajouter de la documentation @@ -9518,9 +9511,6 @@ Valider maintenant ? Remove Supprimer - - - Help::Internal::FilterSettingsPage Filters Filtres @@ -9545,10 +9535,6 @@ Valider maintenant ? The filter "%1" will only show documentation files that have the attributes %2 specified. Le filtre "%1" ne montrera que les fichiers de la documentation qui ont les attributs %2 spécifiés. - - Help - Aide - <html><body> <p> @@ -9571,10 +9557,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e Add Ajouter - - Remove - Supprimer - <html><body> <p> @@ -9585,9 +9567,6 @@ Add, modify, and remove document filters, which determine the documentation set Ajouter, modifier et supprimer des filtres de documents, lesquels déterminent la documentation qui sera affichée dans le mode d'aide. Les attributs sont définis dans les documents. Sélectionnez-les pour afficher la documentation pertinente. Notez que certains attributs sont définis dans plusieurs documents. </p></body></html> - - - Help::Internal::HelpIndexFilter Help index Index de l'aide @@ -9596,16 +9575,10 @@ Ajouter, modifier et supprimer des filtres de documents, lesquels déterminent l Help Index Index de l'aide - - - Help::Internal::HelpMode Help Aide - - - Help::Internal::HelpPlugin Contents Contenu @@ -9786,10 +9759,6 @@ Ajouter, modifier et supprimer des filtres de documents, lesquels déterminent l Close current Page Fermer la page courante - - Unfiltered - Sans filtre - No Documentation Aucune documentation @@ -9807,9 +9776,6 @@ Ajouter, modifier et supprimer des filtres de documents, lesquels déterminent l better than "filtré par" in the context Filtre : - - - Help::Internal::SearchWidget &Copy Co&pier @@ -9854,17 +9820,6 @@ Ajouter, modifier et supprimer des filtres de documents, lesquels déterminent l Reload Recharger - - - HelpViewer - - Open Link in New Tab - Ouvrir le lien dans un nouvel onglet - - - <title>about:blank</title> - <title>À propos : vide</title> - <html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Error 404...</title></head><body><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div></body> <html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Erreur 404...</title></head><body><div align="center"><br><br><h1>La page n'a pas pu être trouvée</h1><br><h3>"%1"</h3></div></body> @@ -9873,10 +9828,6 @@ Ajouter, modifier et supprimer des filtres de documents, lesquels déterminent l <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Erreur 404...</title><div align="center"><br><br><h1>La page est introuvable</h1><br><h3>"%1"</h3></div> - - Help - Aide - Unable to launch external application. @@ -9887,10 +9838,6 @@ Ajouter, modifier et supprimer des filtres de documents, lesquels déterminent l OK OK - - Copy &Link Location - &Copier l'adresse du lien - Open Link in New Tab Ctrl+LMB Ouvrir le lien dans un nouvel onglet Ctrl+LMB @@ -20471,15 +20418,11 @@ p, li { white-space: pre-wrap; } - Help::Internal::GeneralSettingsPage + Help General settings Réglages généraux - - Help - Aide - General Settings Réglages généraux @@ -20629,9 +20572,6 @@ p, li { white-space: pre-wrap; } Export Bookmarks... Exporter les signets... - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. Il ne s'agit pas d'un fichier XBEL version 1.0. @@ -25813,20 +25753,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. Help - - Help - Aide - - - - Help::HelpManager - - Unfiltered - Sans filtre - - - - Help::Internal::HelpViewer <title>about:blank</title> <title>À propos : vide</title> @@ -25835,26 +25761,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. <html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Error 404...</title></head><body><div align="center"><br/><br/><h1>The page could not be found</h1><br/><h3>'%1'</h3></div></body></html> <html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Erreur 404...</title></head><body><div align="center"><br/><br/><h1>La page n'a pas pu être trouvée</h1><br/><h3>'%1'</h3></div></body></html> - - Open Link - Ouvrir le lien - - - Open Link as New Page - Ouvrir le lien en tant que nouvelle page - - - Copy Link - Copier le lien - - - Copy - Copier - - - Reload - Recharger - Error loading: %1 Erreur lors du chargement : %1 @@ -25863,16 +25769,10 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. Unknown or unsupported Content! Contenu inconnu ou non supporté ! - - - Help::Internal::OpenPagesModel (Untitled) (Sans titre) - - - Help::Internal::OpenPagesWidget Close %1 Fermer %1 @@ -30328,7 +30228,7 @@ Preselects Qt for Simulator and mobile targets if available - Help::Internal::RemoteFilterOptions + Help Filter configuration Configuration du filtre @@ -30353,14 +30253,6 @@ Preselects Qt for Simulator and mobile targets if available Double click to edit item. Double-cliquez pour modifier l'élément. - - Add - Ajouter - - - Remove - Supprimer - Double-click to edit item. Double-cliquez pour modifier l'élément. @@ -31849,11 +31741,7 @@ plutôt que dans le répertoire d'installation lors d'une exècution e - Help::Internal::ExternalHelpWindow - - Show Sidebar - Afficher la barre latérale - + Help Qt Creator Offline Help Aide hors ligne de Qt Creator @@ -31899,14 +31787,11 @@ plutôt que dans le répertoire d'installation lors d'une exècution e - Help::Internal::OpenPagesManager + Help Copy Full Path to Clipboard Copier le chemin complet dans le presse papier - - - Help::Internal::RemoteHelpFilter Online Documentation Documentation en ligne diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 3174890520a..f7a2d7621fb 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -4500,7 +4500,7 @@ Možeš birati između skladištenja promjena ili njihovih odbacivanja. - Help::Internal::DocSettingsPage + Help Add and remove compressed help files, .qch. Dodaj i ukloni komprimirane datoteke pomoći, .qch. @@ -4549,9 +4549,6 @@ Možeš birati između skladištenja promjena ili njihovih odbacivanja.Unable to register documentation. Nije moguće refistrirati dokumentaciju. - - - Help::Internal::FilterSettingsPage <html><body> <p> @@ -4578,14 +4575,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri No user defined filters available or no filter selected. Korisnički definirani filtri nisu dostupni ili filtri nisu odabrani. - - Add... - Dodaj … - - - Remove - Ukloni - Unfiltered Nefiltrirano @@ -4602,9 +4591,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri The filter "%1" will only show documentation files that have the attributes %2 specified. Filtar "%1" će prikazati samo datoteke dokumentacije koje imaju određene atribute %2. - - - Help::Internal::GeneralSettingsPage Font Font @@ -4725,17 +4711,10 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri Save File Spremi datoteku - - - Help::Internal::RemoteFilterOptions Add Dodaj - - Remove - Ukloni - Move Up Premjesti prema gore @@ -26963,9 +26942,6 @@ instead of its installation directory when run outside git bash. The page could not be found Nije bilo moguće naći stranicu - - - Help::Internal::HelpPlugin Index Indeks @@ -27002,10 +26978,6 @@ instead of its installation directory when run outside git bash. System Information... Informacije o sustavu … - - Unfiltered - Nefiltrirano - No Documentation Nema dokumentacije @@ -27026,9 +26998,6 @@ instead of its installation directory when run outside git bash. Copy to Clipboard Kopiraj u međuspremnik - - - HelpViewer Open Link as New Page Otvori poveznicu kao novu stranicu @@ -27037,30 +27006,14 @@ instead of its installation directory when run outside git bash. Open Link in Window Otvori poveznicu u prozoru - - - Help::Internal::HelpIndexFilter Help Index Indeks pomoći - - - Help::Internal::HelpManager Update Documentation Aktualiziraj dokumentaciju - - - Help::Internal::HelpMode - - Help - Pomoć - - - - Help::Internal::HelpWidget Open in Help Mode Otvori u pomoći @@ -27161,10 +27114,6 @@ instead of its installation directory when run outside git bash. Ctrl+Shift+O Ctrl+Shift+O - - Help - Pomoć - Help - %1 Pomoć – %1 @@ -27173,23 +27122,14 @@ instead of its installation directory when run outside git bash. Print Documentation Ispiši dokumentaciju - - - Help::Internal::OpenPagesManager Copy Full Path to Clipboard Kopiraj cijelu stazu u međuspremnik - - - Help::Internal::OpenPagesModel (Untitled) (Bezimeno) - - - Help::Internal::OpenPagesWidget Close %1 Zatvori „%1” @@ -27198,23 +27138,14 @@ instead of its installation directory when run outside git bash. Close All Except %1 Zatvori sve, osim „%1” - - - Help::Internal::RemoteHelpFilter Web Search Web pretraga - - - Help::Internal::SearchTaskHandler Get Help Online Pomoć putem interneta - - - Help::Internal::SearchWidget Indexing Documentation Dokumentacja za indeksiranje @@ -27223,10 +27154,6 @@ instead of its installation directory when run outside git bash. Open Link Otvori poveznicu - - Open Link as New Page - Otvori poveznicu kao novu stranicu - Copy Link Kopiraj poveznicu @@ -27239,35 +27166,10 @@ instead of its installation directory when run outside git bash. Reload Učitaj ponovo - - - Help::Internal::SearchSideBarItem Regenerate Index Ponovo generiraj indeks - - - Help::Internal::TextBrowserHelpWidget - - Open Link - Otvori poveznicu - - - Copy Link - Kopiraj poveznicu - - - Copy - Kopiraj - - - Reload - Učitaj ponovo - - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. Datoteka nije XBEL datoteka verzije 1.0. @@ -43332,19 +43234,11 @@ What do you want to do? - Help::Internal::IndexWindow + Help &Look for: &Traži: - - Open Link - Otvori poveznicu - - - Open Link as New Page - Otvori poveznicu kao novu stranicu - MimeType diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index 14c8bef68b6..e87af3f821f 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -8578,7 +8578,7 @@ on slow machines. In this case, the value should be increased. - Help::Internal::0 + Help Add new page Új lap hozzáadása @@ -8687,10 +8687,6 @@ on slow machines. In this case, the value should be increased. Activate Search in Help mode Keresés aktiválása segítség módban - - Unfiltered - Szűrés nélküli - <html><head><title>No Documentation</title></head><body><br/><center><b>%1</b><br/>No documentation available.</center></body></html> <html><head><title>Nincs dokumentáció</title></head><body><br/><center><b>%1</b><br/>Nincsen elérhető dokumentáció.</center></body></html> @@ -8725,10 +8721,6 @@ Fájl kihagyása. &Copy &Másolás - - Copy &Link Location - &Link címének másolása - Open Link in New Tab Link megnyitása új lapon @@ -8747,9 +8739,6 @@ Skipping file. A(z) %1 dokumentációs fájl nem kompatibilis! Fájl kihagyása. - - - Help::Internal::CentralWidget Add new page Új lap hozzáadása @@ -8778,9 +8767,6 @@ Fájl kihagyása. Add Bookmark for this Page... Könyvjelző hozzáadása ehhez az oldalhoz... - - - Help::Internal::DocSettingsPage Documentation Dokumentáció @@ -8805,9 +8791,6 @@ Fájl kihagyása. Cannot unregister documentation file %1! Nem lehet törölni a(z) %1 dokumentációs fájl nyilvántartását! - - - Help::Internal::FilterSettingsPage Filters Szűrők @@ -8816,9 +8799,6 @@ Fájl kihagyása. Help Segítség - - - Help::Internal::GeneralSettingsPage General settings Általános beállítások @@ -8843,23 +8823,14 @@ Fájl kihagyása. Save File Fájl mentése - - - Help::Internal::HelpIndexFilter Help index Segítség - Index - - - Help::Internal::HelpMode Help Segítség - - - Help::Internal::HelpPlugin Contents Tartalom @@ -8956,9 +8927,6 @@ Fájl kihagyása. Filtered by: Szűrő feltétel: - - - Help::Internal::SearchWidget &Copy &Másolás @@ -8975,9 +8943,6 @@ Fájl kihagyása. Select All Az összes kijelőlése - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. A fájl nem XBEL 1.0-s verziójú fájl. diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index 628af655a80..7a65e1d330e 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -5918,7 +5918,7 @@ Causa: %3 - Help::Internal::CentralWidget + Help Add new page Aggiungi una pagina @@ -5947,9 +5947,6 @@ Causa: %3 Add Bookmark for this Page... Aggiungi un Segnalibro su questa Pagina... - - - Help::Internal::DocSettingsPage Documentation Documentazione @@ -5974,9 +5971,6 @@ Causa: %3 Cannot unregister documentation file %1! Impossibile de-registrare il file di documentazione %1! - - - Help::Internal::FilterSettingsPage Filters Filtri @@ -5985,23 +5979,14 @@ Causa: %3 Help Guida - - - Help::Internal::HelpIndexFilter Help index Indice della guida - - - Help::Internal::HelpMode Help Guida - - - Help::Internal::HelpPlugin Contents Contenuti @@ -6094,9 +6079,6 @@ Causa: %3 Filtered by: Filtrato da: - - - Help::Internal::SearchWidget &Copy &Copia @@ -12799,7 +12781,7 @@ p, li { white-space: pre-wrap; } - Help::Internal::GeneralSettingsPage + Help General settings Impostazioni Generali @@ -12826,7 +12808,7 @@ p, li { white-space: pre-wrap; } - Help::Internal::XbelReader + Help The file is not an XBEL version 1.0 file. diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 894f210bce1..a24efbf1103 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -3570,7 +3570,7 @@ You can choose between stashing the changes or discarding them. - Help::Internal::DocSettingsPage + Help Add and remove compressed help files, .qch. 圧縮済みヘルプファイル(.qch)の追加や削除を行います。 @@ -3619,9 +3619,6 @@ You can choose between stashing the changes or discarding them. %1 (auto-detected) %1 (自動検出) - - - Help::Internal::FilterSettingsPage <html><body> <p> @@ -3648,10 +3645,6 @@ Add, modify, and remove document filters, which determine the documentation set No user defined filters available or no filter selected. 使用可能なユーザー定義フィルタがないかフィルタが選択されていません。 - - Remove - 削除 - Unfiltered フィルタなし @@ -3668,13 +3661,6 @@ Add, modify, and remove document filters, which determine the documentation set The filter "%1" will only show documentation files that have the attributes %2 specified. フィルタ "%1" は、属性 %2 が指定されたドキュメントのみ表示します。 - - Add... - 追加... - - - - Help::Internal::GeneralSettingsPage Form フォーム @@ -3828,17 +3814,10 @@ Add, modify, and remove document filters, which determine the documentation set Viewer backend: ビューアーのバックエンド: - - - Help::Internal::RemoteFilterOptions Add 追加 - - Remove - 削除 - Double-click to edit item. ダブルクリックでアイテムを編集します。 @@ -22418,23 +22397,10 @@ instead of its installation directory when run outside git bash. The page could not be found ページが見つかりませんでした - - - Help::Internal::HelpIndexFilter Help Index ヘルプインデックス - - - Help::Internal::HelpMode - - Help - ヘルプ - - - - Help::Internal::HelpPlugin Index インデックス @@ -22495,27 +22461,14 @@ instead of its installation directory when run outside git bash. Open Pages ページを開く - - Unfiltered - フィルタなし - - - - Help::Internal::OpenPagesManager Copy Full Path to Clipboard フルパスをクリップボードにコピー - - - Help::Internal::OpenPagesModel (Untitled) (無題) - - - Help::Internal::OpenPagesWidget Close %1 %1 を閉じる @@ -22524,16 +22477,10 @@ instead of its installation directory when run outside git bash. Close All Except %1 %1 以外のすべてを閉じる - - - Help::Internal::RemoteHelpFilter Web Search Web 検索 - - - Help::Internal::SearchWidget Indexing Documentation ドキュメントのインデックス作成中 @@ -22558,9 +22505,6 @@ instead of its installation directory when run outside git bash. Reload 再読込 - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. ファイルは XBEL バージョン 1.0 形式のファイルではありません。 @@ -36796,15 +36740,11 @@ API バージョンが %1 以上の SDK をインストールしてください - Help::Internal::HelpWidget + Help Go to Help Mode ヘルプモードに移行 - - (Untitled) - (無題) - Home ホーム @@ -36841,14 +36781,6 @@ API バージョンが %1 以上の SDK をインストールしてください Reset Font Size フォントサイズをリセット - - Reload - 再読込 - - - Unfiltered - フィルタなし - Meta+Shift+C Meta+Shift+C @@ -36901,10 +36833,6 @@ API バージョンが %1 以上の SDK をインストールしてください Ctrl+Shift+O Ctrl+Shift+O - - Help - ヘルプ - Help - %1 ヘルプ - %1 @@ -36913,47 +36841,15 @@ API バージョンが %1 以上の SDK をインストールしてください Print Documentation ドキュメントの印刷 - - - Help::Internal::QtWebKitHelpWidget - - Open Link as New Page - リンクを新しいページで開く - - - - Help::Internal::SearchTaskHandler Get Help Online オンラインからヘルプを取得 - - - Help::Internal::SearchSideBarItem Regenerate Index インデックスの再生成 - - Help::Internal::TextBrowserHelpWidget - - Open Link - リンクを開く - - - Copy Link - リンクをコピー - - - Copy - コピー - - - Reload - 再読込 - - ProjectExplorer::DeploymentDataModel @@ -43779,19 +43675,12 @@ Leave empty to search through the file system. - Help::Internal::HelpViewer + Help Unknown or unsupported content. 不明かサポート対象外のコンテンツです。 - - HelpViewer - - Open Link as New Page - リンクを新しいページで開く - - ImageViewer @@ -46573,19 +46462,11 @@ Android パッケージソースディレクトリのファイルはビルドデ - Help::Internal::IndexWindow + Help &Look for: 検索文字列(&L): - - Open Link - リンクを開く - - - Open Link as New Page - リンクを新しいページで開く - Core::Internal::SpotlightLocatorFilter @@ -53130,38 +53011,7 @@ Stepping into the module or setting breakpoints by file and line is expected to - Help::DocSettingsPageWidget - - %1 (auto-detected) - %1 (自動検出) - - - Add Documentation - ドキュメントの追加 - - - Qt Help Files (*.qch) - Qt ヘルプファイル (*.qch) - - - Invalid documentation file: - 無効なドキュメントファイル: - - - Namespace already registered: - 名前空間は既に登録済み: - - - Unable to register documentation. - ドキュメントの登録ができませんでした。 - - - Documentation - ドキュメント - - - - Help::HelpViewer + Help Zoom: %1% 拡大率: %1% diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 3c770001673..43df21b93d0 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -6533,7 +6533,7 @@ Commit now? - Help::Internal::DocSettingsPage + Help Documentation Dokumentacja @@ -6582,9 +6582,6 @@ Commit now? Remove Usuń - - - Help::Internal::FilterSettingsPage Filters Filtry @@ -6617,10 +6614,6 @@ Commit now? 1 1 - - Remove - Usuń - <html><body> <p> @@ -6631,13 +6624,6 @@ Add, modify, and remove document filters, which determine the documentation set Dodaj, zmodyfikuj lub usuń filtry dokumentów, które determinują zestaw dokumentacji wyświetlanej w trybie "Pomocy". Atrybuty są zdefiniowane w dokumentach. Zaznaczenie ich spowoduje wyświetlenie zestawu odpowiedniej dokumentacji. Zwróć uwagę, że niektóre atrybuty mogą być zdefiniowane w kilku dokumentach. </p></body></html> - - Add... - Dodaj... - - - - Help::Internal::GeneralSettingsPage General Ogólne @@ -6762,23 +6748,14 @@ Dodaj, zmodyfikuj lub usuń filtry dokumentów, które determinują zestaw dokum Always Show in External Window Zawsze pokazuj w zewnętrznym oknie - - - Help::Internal::HelpIndexFilter Help Index Indeks pomocy - - - Help::Internal::HelpMode Help Pomoc - - - Help::Internal::HelpPlugin Contents Zawartość @@ -6835,13 +6812,6 @@ Dodaj, zmodyfikuj lub usuń filtry dokumentów, które determinują zestaw dokum Open Pages Otwarte strony - - Unfiltered - Nieprzefiltrowane - - - - Help::Internal::SearchWidget Indexing Documentation Indeksowanie dokumentacji @@ -6866,9 +6836,6 @@ Dodaj, zmodyfikuj lub usuń filtry dokumentów, które determinują zestaw dokum Reload Przeładuj - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. Ten plik nie jest plikiem XBEL wersji 1.0. @@ -10162,11 +10129,7 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych - HelpViewer - - Open Link as New Page - Otwórz odsyłacz na nowej stronie - + Help Open Link in Window Otwórz odsyłacz w oknie @@ -11339,10 +11302,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM Help - - Help - Pomoc - Error loading page Błąd ładowania strony @@ -11359,16 +11318,10 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM The page could not be found Nie można odnaleźć strony - - - Help::Internal::OpenPagesModel (Untitled) (Nienazwany) - - - Help::Internal::OpenPagesWidget Close %1 Zamknij %1 @@ -13077,15 +13030,11 @@ Identyfikatory muszą rozpoczynać się małą literą. - Help::Internal::RemoteFilterOptions + Help Add Dodaj - - Remove - Usuń - Double-click to edit item. Kliknij dwukrotnie aby zmodyfikować element. @@ -13645,14 +13594,11 @@ zamiast w jego katalogu instalacyjnym. - Help::Internal::OpenPagesManager + Help Copy Full Path to Clipboard Skopiuj pełną ścieżkę do schowka - - - Help::Internal::RemoteHelpFilter Web Search Szukanie w sieci @@ -33126,7 +33072,7 @@ Use this only if you are prototyping. You cannot create a full application with - Help::Internal::HelpWidget + Help Open in Help Mode Otwórz w trybie pomocy @@ -33227,10 +33173,6 @@ Use this only if you are prototyping. You cannot create a full application with Ctrl+Shift+O Ctrl+Shift+O - - Help - Pomoc - Help - %1 Pomoc - %1 @@ -33239,40 +33181,15 @@ Use this only if you are prototyping. You cannot create a full application with Print Documentation Wydruk dokumentacji - - - Help::Internal::SearchTaskHandler Get Help Online Sięgnij po pomoc online - - - Help::Internal::SearchSideBarItem Regenerate Index Ponownie wygeneruj indeks - - Help::Internal::TextBrowserHelpWidget - - Open Link - Otwórz odsyłacz - - - Copy Link - Skopiuj odsyłacz - - - Copy - Skopiuj - - - Reload - Przeładuj - - Mercurial::Internal::MercurialEditorWidget @@ -34218,19 +34135,11 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan - Help::Internal::IndexWindow + Help &Look for: Wy&szukaj: - - Open Link - Otwórz odsyłacz - - - Open Link as New Page - Otwórz odsyłacz na nowej stronie - RowLabel diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 0210cd861ec..a7833c627f5 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -23898,9 +23898,6 @@ Leave empty to search through the file system. The page could not be found Не удалось найти страницу - - - Help::DocSettingsPageWidget %1 (auto-detected) %1 (автоопределённое) @@ -23933,9 +23930,6 @@ Leave empty to search through the file system. Documentation Документация - - - Help::Internal::DocSettingsPage Add and remove compressed help files, .qch. Добавление и удаление сжатых файлов справки, .qch. @@ -23952,9 +23946,6 @@ Leave empty to search through the file system. Remove Удалить - - - Help::Internal::FilterSettingsPage Filters Фильтры @@ -23987,10 +23978,6 @@ Leave empty to search through the file system. 1 1 - - Remove - Удалить - <html><body> <p> @@ -24001,13 +23988,6 @@ Add, modify, and remove document filters, which determine the documentation set Добавление, изменение и удаление фильтров документов, которые определяют отображение набора документации в режиме справки. Атрибуты определены в самих документах. Выбор их приведёт к отображению подходящей документации. Стоит иметь в виду, что некоторые атрибуты могут быть определены в нескольких документах. </p></body></html> - - Add... - Добавить... - - - - Help::Internal::GeneralSettingsPage General Основное @@ -24145,30 +24125,14 @@ Add, modify, and remove document filters, which determine the documentation set Viewer backend: Просмотрщик: - - - Help::Internal::HelpIndexFilter Help Index Указатель справки - - - Help::Internal::HelpManager Update Documentation Обновление документации - - - Help::Internal::HelpMode - - Help - Справка - - - - Help::Internal::HelpPlugin Contents Содержание @@ -24225,13 +24189,6 @@ Add, modify, and remove document filters, which determine the documentation set Open Pages Открытые страницы - - Unfiltered - Вся - - - - Help::Internal::HelpWidget (Untitled) (Без имени) @@ -24312,10 +24269,6 @@ Add, modify, and remove document filters, which determine the documentation set Reload Перезагрузить - - Unfiltered - Вся - Meta+Shift+C Meta+Shift+C @@ -24368,10 +24321,6 @@ Add, modify, and remove document filters, which determine the documentation set Ctrl+Shift+O Ctrl+Shift+O - - Help - Справка - Help - %1 Справка - %1 @@ -24380,9 +24329,6 @@ Add, modify, and remove document filters, which determine the documentation set Print Documentation Печать документации - - - Help::Internal::IndexWindow &Look for: &Искать: @@ -24395,9 +24341,6 @@ Add, modify, and remove document filters, which determine the documentation set Open Link as New Page Открыть ссылку в новой странице - - - Help::Internal::LiteHtmlHelpViewer Copy Link Скопировать ссылку @@ -24406,9 +24349,6 @@ Add, modify, and remove document filters, which determine the documentation set Copy Копировать - - - Help::Internal::LocalHelpManager QtWebEngine QtWebEngine @@ -24425,16 +24365,10 @@ Add, modify, and remove document filters, which determine the documentation set QTextBrowser QTextBrowser - - - Help::Internal::OpenPagesManager Copy Full Path to Clipboard Скопировать полный путь в буфер обмена - - - Help::Internal::OpenPagesWidget Close %1 Закрыть %1 @@ -24443,65 +24377,18 @@ Add, modify, and remove document filters, which determine the documentation set Close All Except %1 Закрыть все, кроме %1 - - - Help::Internal::SearchSideBarItem Regenerate Index Обновление указателя - - - Help::Internal::SearchTaskHandler Get Help Online Получить онлайн справку - - - Help::Internal::SearchWidget Indexing Documentation Индексация документации - - Open Link - Открыть ссылку - - - Open Link as New Page - Открыть ссылку в новой странице - - - Copy Link - Скопировать ссылку - - - Copy - Копировать - - - Reload - Перезагрузить - - - - Help::Internal::TextBrowserHelpWidget - - Open Link - Открыть ссылку - - - Copy Link - Скопировать ссылку - - - Copy - Копировать - - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. Содержимое файла не соответствует XBEL версии 1.0. @@ -24510,13 +24397,6 @@ Add, modify, and remove document filters, which determine the documentation set Unknown title Неизвестный заголовок - - - HelpViewer - - Open Link as New Page - Открыть ссылку в новой странице - Open Link in Window Отрыть ссылку в окне diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 834a1412d1c..a38bf50b1e4 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -6345,14 +6345,11 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr - Help::Internal::CentralWidget + Help Print Document Natisni dokument - - - Help::Internal::DocSettingsPage Documentation Dokumentacija @@ -6365,9 +6362,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Qt Help Files (*.qch) Datoteke s pomočjo za Qt (*.qch) - - - Help::Internal::FilterSettingsPage Filters Filtri @@ -6392,9 +6386,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr The filter "%1" will only show documentation files that have the attributes %2 specified. Filter »%1« bo prikazal le dokumentacijske datoteke, ki imajo določene lastnosti %2. - - - Help::Internal::HelpIndexFilter Help Index Kazalo pomoči @@ -6403,16 +6394,10 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Help index Seznam pomoči - - - Help::Internal::HelpMode Help Pomoč - - - Help::Internal::HelpPlugin Contents Vsebina @@ -6501,10 +6486,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Activate Search in Help mode V načinu Pomoč aktiviraj Iskanje - - Unfiltered - Nefiltrirano - No Documentation Ni dokumentacije @@ -6553,9 +6534,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Close current Page Zapri trenutno stran - - - Help::Internal::SearchWidget Indexing Indeksiranje @@ -6584,9 +6562,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Reload Znova naloži - - - HelpViewer <title>about:blank</title> <title>about:blank</title> @@ -13064,7 +13039,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan - Help::Internal::GeneralSettingsPage + Help General Settings Splošne nastavitve @@ -13093,9 +13068,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan There was an error while importing bookmarks! Med uvažanjem zaznamkov je prišlo do napake. - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. Datoteka ni v obliki XBEL različice 1.0. @@ -16491,43 +16463,10 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 Help - - Help - Pomoč - - - - Help::Internal::HelpViewer - - Open Link - Odpri povezavo - - - Open Link as New Page - Odpri povezavo kot novo stran - - - Copy Link - Skopiraj povezavo - - - Copy - Skopiraj - - - Reload - Znova naloži - - - - Help::Internal::OpenPagesModel (Untitled) (neimenovano) - - - Help::Internal::OpenPagesWidget Close %1 Zapri %1 @@ -20013,7 +19952,7 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. - Help::Internal::RemoteFilterOptions + Help Filter configuration Nastavitev filtra @@ -25196,7 +25135,7 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen. - Help::Internal::ExternalHelpWindow + Help Show Sidebar Prikaži stranski pas @@ -25205,16 +25144,10 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen. Qt Creator Offline Help Pomoč za Qt Creator (brez povezave) - - - Help::Internal::OpenPagesManager Copy Full Path to Clipboard Skopiraj celotno pot na odložišče - - - Help::Internal::RemoteHelpFilter Web Search Spletno iskanje diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 8aaf88a0ee2..e33f9194039 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -11593,16 +11593,10 @@ You can choose between stashing the changes or discarding them. The page could not be found Не вдалось знайти сторінку - - - Help::Internal::CentralWidget Print Document Друк документа - - - Help::Internal::DocSettingsPage Documentation Документація @@ -11651,9 +11645,6 @@ You can choose between stashing the changes or discarding them. Remove Видалити - - - Help::Internal::ExternalHelpWindow Show Sidebar Показати бічну панель @@ -11662,9 +11653,6 @@ You can choose between stashing the changes or discarding them. Qt Creator Offline Help Локальна довідка Qt Creator - - - Help::Internal::FilterSettingsPage Filters Фільтри @@ -11697,14 +11685,6 @@ You can choose between stashing the changes or discarding them. 1 0.1x {1?} - - Add - Додати - - - Remove - Видалити - <html><body> <p> @@ -11715,13 +11695,6 @@ Add, modify, and remove document filters, which determine the documentation set Додавайте, змінюйте та видаляйте фільтри документів, які задають набір документації, що відображається в режимі довідки. Атрибути визначені в документах. Оберіть їх для відображення набору відповідної документації. Майте на увазі, що деякі атрибути визначені в кількох документах. </p></body></html> - - Add... - Додати... - - - - Help::Internal::GeneralSettingsPage General Загальне @@ -11862,27 +11835,10 @@ Add, modify, and remove document filters, which determine the documentation set Always Show in External Window Завжди показувати в зовнішньому вікні - - - Help::Internal::HelpIndexFilter Help Index Покажчик довідки - - - Help::Internal::HelpMode - - Help - Довідка - - - - Help::Internal::HelpPlugin - - Home - Домівка - Previous Page Попередня сторінка @@ -11891,10 +11847,6 @@ Add, modify, and remove document filters, which determine the documentation set Next Page Наступна сторінка - - Add Bookmark - Додати закладку - Contents Зміст @@ -11903,14 +11855,6 @@ Add, modify, and remove document filters, which determine the documentation set Index Покажчик - - Meta+M - Meta+M - - - Ctrl+M - Ctrl+M - Context Help Контекстна довідка @@ -11931,26 +11875,10 @@ Add, modify, and remove document filters, which determine the documentation set No documentation available. Немає доступної документації. - - Increase Font Size - Збільшити розмір шрифту - - - Decrease Font Size - Зменшити розмір шрифту - - - Reset Font Size - Відновити розмір шрифту - Activate Index in Help mode Активувати покажчик в режимі довідки - - Meta+I - Meta+I - Ctrl+Shift+I Ctrl+Shift+I @@ -11959,42 +11887,6 @@ Add, modify, and remove document filters, which determine the documentation set Activate Contents in Help mode Активувати зміст в режимі довідки - - Meta+Shift+C - Meta+Shift+C - - - Ctrl+Shift+C - Ctrl+Shift+C - - - Meta+/ - Meta+/ - - - Ctrl+Shift+/ - Ctrl+Shift+/ - - - Meta+B - Meta+B - - - Ctrl+Shift+B - Ctrl+Shift+B - - - Meta+O - Meta+O - - - Ctrl+Shift+O - Ctrl+Shift+O - - - Show Sidebar - Показати бічну панель - Close current page Закрити поточну сторінку @@ -12027,14 +11919,6 @@ Add, modify, and remove document filters, which determine the documentation set Activate Open Pages in Help mode Активувати відкриті сторінки в режимі довідки - - Unfiltered - Без фільтра - - - Go to Help Mode - Перейти в режим довідки - Next Вперед @@ -12051,9 +11935,6 @@ Add, modify, and remove document filters, which determine the documentation set Filtered by: Фільтрувати за: - - - Help::Internal::HelpViewer <title>about:blank</title> <title>about:blank</title> @@ -12062,30 +11943,6 @@ Add, modify, and remove document filters, which determine the documentation set <html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Error 404...</title></head><body><div align="center"><br/><br/><h1>The page could not be found</h1><br/><h3>'%1'</h3></div></body></html> <html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Помилка 404...</title></head><body><div align="center"><br><br><h1>Не вдалось знайти сторінку</h1><br><h3>'%1'</h3></div></body> - - Open Link - Відкрити посилання - - - Open Link as New Page - Відкрити посилання в новій сторінці - - - Copy Link - Копіювати посилання - - - Copy - Копіювати - - - Reload - Перезавантажити - - - Error loading: %1 - Помилка завантаження: %1 - Unknown or unsupported Content! Невідомий або непідтримуваний зміст! @@ -12098,23 +11955,14 @@ Add, modify, and remove document filters, which determine the documentation set Unknown or unsupported content. Невідомий або непідтримуваний зміст. - - - Help::Internal::OpenPagesManager Copy Full Path to Clipboard Скопіювати повний шлях до буферу обміну - - - Help::Internal::OpenPagesModel (Untitled) (Без назви) - - - Help::Internal::OpenPagesWidget Close %1 Закрити %1 @@ -12123,9 +11971,6 @@ Add, modify, and remove document filters, which determine the documentation set Close All Except %1 Закрити все, окрім %1 - - - Help::Internal::RemoteFilterOptions Prefix: Префікс: @@ -12138,10 +11983,6 @@ Add, modify, and remove document filters, which determine the documentation set Add Додати - - Remove - Видалити - Double-click to edit item. Клацніть двічі, щоб змінити елемент. @@ -12150,16 +11991,10 @@ Add, modify, and remove document filters, which determine the documentation set Edit Filter Configuration Редагування конфігурації фільтра - - - Help::Internal::RemoteHelpFilter Web Search Пошук у Web - - - Help::Internal::SearchWidget Indexing Індексування @@ -12192,9 +12027,6 @@ Add, modify, and remove document filters, which determine the documentation set Reload Перезавантажити - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. Цей файл не є файлом XBEL версії 1.0. @@ -12203,9 +12035,6 @@ Add, modify, and remove document filters, which determine the documentation set Unknown title Невідомий заголовок - - - HelpViewer Error 404... Помилка 404... @@ -12230,10 +12059,6 @@ Add, modify, and remove document filters, which determine the documentation set <li>If your computer or network is protected by a firewall or proxy, make sure the application is permitted to access the network.</li> <li>Якщо ваш комп'ютер або мережа захищена мережевим екраном або проксі, переконайтесь, що програмі дозволено доступ до мережі.</li> - - Open Link as New Page - Відкрити посилання в новій сторінці - ImageSpecifics @@ -45178,7 +45003,7 @@ Install an SDK of at least API version %1. - Help::Internal::HelpWidget + Help Go to Help Mode Перейти в режим довідки @@ -45231,10 +45056,6 @@ Install an SDK of at least API version %1. Meta+I Meta+I - - Ctrl+Shift+I - Ctrl+Shift+I - Activate Help Bookmarks View Активувати перегляд закладок довідки @@ -45275,10 +45096,6 @@ Install an SDK of at least API version %1. Ctrl+Shift+O Ctrl+Shift+O - - Help - Довідка - Help - %1 Довідка - %1 @@ -45287,51 +45104,15 @@ Install an SDK of at least API version %1. Print Documentation Друк документації - - - Help::Internal::QtWebKitHelpWidget - - Open Link as New Page - Відкрити посилання в новій сторінці - - - - Help::Internal::SearchTaskHandler Get Help Online Отримати допомогу в мережі - - - Help::Internal::SearchSideBarItem Regenerate Index Перегенерувати індекс - - Help::Internal::TextBrowserHelpWidget - - Open Link - Відкрити посилання - - - Open Link as New Page - Відкрити посилання в новій сторінці - - - Copy Link - Копіювати посилання - - - Copy - Копіювати - - - Reload - Перезавантажити - - Mercurial::Internal::CloneWizardFactory @@ -49417,19 +49198,11 @@ The files in the Android package source directory are copied to the build direct - Help::Internal::IndexWindow + Help &Look for: &Шукати: - - Open Link - Відкрити посилання - - - Open Link as New Page - Відкрити посилання в новій сторінці - Utils::GlobalMacroExpander diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 719191ae8cb..572501228aa 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -8595,7 +8595,7 @@ on slow machines. In this case, the value should be increased. - Help::Internal::CentralWidget + Help Add new page 添加新页 @@ -8624,17 +8624,10 @@ on slow machines. In this case, the value should be increased. Add Bookmark for this Page... 为此页添加书签... - - - Help::Internal::DocSettingsPage Documentation 文档 - - Help - 帮助 - Add Documentation 添加文档 @@ -8683,9 +8676,6 @@ on slow machines. In this case, the value should be increased. Remove 删除 - - - Help::Internal::FilterSettingsPage Filters 过滤器 @@ -8710,10 +8700,6 @@ on slow machines. In this case, the value should be increased. The filter "%1" will only show documentation files that have the attributes %2 specified. 过滤器 "%1" 只会显示包含指定属性 "%2" 的文档文件。 - - Help - 帮助 - <html><body> <p> @@ -8736,13 +8722,6 @@ Add, modify, and remove document filters, which determine the documentation set Add 添加 - - Remove - 删除 - - - - Help::Internal::HelpIndexFilter Help index 帮助索引 @@ -8751,16 +8730,10 @@ Add, modify, and remove document filters, which determine the documentation set Help Index 帮助索引 - - - Help::Internal::HelpMode Help 帮助 - - - Help::Internal::HelpPlugin Contents 目录 @@ -8945,10 +8918,6 @@ Add, modify, and remove document filters, which determine the documentation set Close current Page 关闭当前页 - - Unfiltered - 未过滤 - No Documentation 没有文档 @@ -8965,9 +8934,6 @@ Add, modify, and remove document filters, which determine the documentation set Filtered by: 过滤方式: - - - Help::Internal::SearchWidget &Copy 复制(&C) @@ -9012,13 +8978,6 @@ Add, modify, and remove document filters, which determine the documentation set Reload 重新载入 - - - HelpViewer - - Open Link in New Tab - 在新页面打开链接 - <title>about:blank</title> <title>关于:空白页</title> @@ -9031,10 +8990,6 @@ Add, modify, and remove document filters, which determine the documentation set <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>错误 404...</title><div align="center"><br><br><h1>找不到页面</h1><br><h3>'%1'</h3></div> - - Help - 帮助 - Unable to launch external application. @@ -9045,10 +9000,6 @@ Add, modify, and remove document filters, which determine the documentation set OK OK - - Copy &Link Location - 复制链接位置(&L) - Open Link in New Tab Ctrl+LMB 在新页面打开链接 Ctrl+LMB @@ -18870,15 +18821,11 @@ Will not be applied to whitespace in comments and strings. - Help::Internal::GeneralSettingsPage + Help General settings 基本设置 - - Help - 帮助 - General Settings 基本设定 @@ -19019,9 +18966,6 @@ Will not be applied to whitespace in comments and strings. Return to editor on closing the last page 关闭最后一页时返回编辑器 - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. 此文件不是XBEL 1.0文件。 @@ -20621,13 +20565,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameCDB - - Help - - Help - 帮助 - - Mercurial::Internal::CloneWizard @@ -23307,34 +23244,7 @@ Previous decimal signed value (big endian): %4 - Help::HelpManager - - Unfiltered - 未过滤 - - - - Help::Internal::HelpViewer - - Open Link - 打开链接 - - - Open Link as New Page - 在新页面打开连接 - - - Copy Link - 复制链接 - - - Copy - 复制 - - - Reload - 重新载入 - + Help Error loading: %1 载入 %1 除错 @@ -23343,16 +23253,10 @@ Previous decimal signed value (big endian): %4 Unknown or unsupported Content! 未知的或不支持的内容！ - - - Help::Internal::OpenPagesModel (Untitled) (未命名) - - - Help::Internal::OpenPagesWidget Close %1 关闭%1 @@ -28181,7 +28085,7 @@ Id必须以小写字母开头。 - Help::Internal::RemoteFilterOptions + Help Filter configuration 过滤器设置 @@ -28206,14 +28110,6 @@ Id必须以小写字母开头。 Double click to edit item. 双击编辑元素. - - Add - 添加 - - - Remove - 删除 - Double-click to edit item. 双击编辑元素。 @@ -29727,11 +29623,7 @@ instead of its installation directory when run outside git bash. - Help::Internal::ExternalHelpWindow - - Show Sidebar - 显示边栏 - + Help Qt Creator Offline Help Qt Creator离线帮助 @@ -29773,14 +29665,11 @@ instead of its installation directory when run outside git bash. - Help::Internal::OpenPagesManager + Help Copy Full Path to Clipboard 复制完整路径到剪贴板 - - - Help::Internal::RemoteHelpFilter Online Documentation 在线文档 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index d6caa7db158..aa90c9d8f66 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -5808,14 +5808,11 @@ Reason: %3 - Help::Internal::CentralWidget + Help Print Document 列印文件 - - - Help::Internal::DocSettingsPage Documentation 文件 @@ -5860,9 +5857,6 @@ Reason: %3 Remove 移除 - - - Help::Internal::FilterSettingsPage Filters 過濾器 @@ -5909,10 +5903,6 @@ Add, modify, and remove document filters, which determine the documentation set Add 新增 - - Remove - 移除 - <html><body> <p> @@ -5920,23 +5910,14 @@ Add, modify, and remove document filters, which determine the documentation set </p></body></html> - - - Help::Internal::HelpIndexFilter Help Index 說明索引 - - - Help::Internal::HelpMode Help 說明 - - - Help::Internal::HelpPlugin Contents 內容 @@ -6077,18 +6058,10 @@ Add, modify, and remove document filters, which determine the documentation set Ctrl+Shift+O Ctrl+Shift+O - - Show Sidebar - - Go to Help Mode 進入說明模式 - - Unfiltered - 未過濾 - No Documentation 沒有文件 @@ -6105,9 +6078,6 @@ Add, modify, and remove document filters, which determine the documentation set Filtered by: 過濾方式： - - - Help::Internal::SearchWidget Indexing 建立索引中 @@ -6136,9 +6106,6 @@ Add, modify, and remove document filters, which determine the documentation set Reload 重新載入 - - - HelpViewer <title>about:blank</title> <title>空白頁</title> @@ -11469,7 +11436,7 @@ Will not be applied to whitespace in comments and strings. - Help::Internal::GeneralSettingsPage + Help General Settings 一般設定 @@ -11602,9 +11569,6 @@ Will not be applied to whitespace in comments and strings. Note: This setting takes effect only if the HTML file does not use a style sheet. - - - Help::Internal::XbelReader The file is not an XBEL version 1.0 file. 此檔案不是 XBEL 1.0 檔案。 @@ -12435,13 +12399,6 @@ Reason: %2 CDB - - Help - - Help - 說明 - - Mercurial::Internal::CloneWizard @@ -13623,27 +13580,7 @@ For qmlproject projects, use the importPaths property to add import paths. - Help::Internal::HelpViewer - - Open Link - 開啟連結 - - - Open Link as New Page - 在新頁面開啟連結 - - - Copy Link - 複製連結 - - - Copy - 複製 - - - Reload - 重新載入 - + Help Error loading: %1 @@ -13652,16 +13589,10 @@ For qmlproject projects, use the importPaths property to add import paths.Unknown or unsupported Content! - - - Help::Internal::OpenPagesModel (Untitled) (未命名) - - - Help::Internal::OpenPagesWidget Close %1 關閉 %1 @@ -16109,7 +16040,7 @@ Ids must begin with a lowercase letter. - Help::Internal::RemoteFilterOptions + Help Filter configuration 過濾器設置 @@ -16122,14 +16053,6 @@ Ids must begin with a lowercase letter. Limit to prefix 前置字串限制 - - Add - 新增 - - - Remove - 移除 - Double-click to edit item. 雙擊以編輯項目。 @@ -17263,7 +17186,7 @@ instead of its installation directory when run outside git bash. - Help::Internal::ExternalHelpWindow + Help Show Sidebar 顯示邊列 @@ -17305,14 +17228,11 @@ instead of its installation directory when run outside git bash. - Help::Internal::OpenPagesManager + Help Copy Full Path to Clipboard 複製完整路徑到剪貼簿 - - - Help::Internal::RemoteHelpFilter Web Search 搜尋網頁 diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index 269b23f0686..d71ee93c330 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -27,6 +27,7 @@ #include "helpconstants.h" #include "helpmanager.h" +#include "helptr.h" #include #include @@ -89,8 +90,6 @@ private: class DocSettingsPageWidget : public Core::IOptionsPageWidget { - Q_DECLARE_TR_FUNCTIONS(Help::DocSettingsPageWidget) - public: DocSettingsPageWidget(); @@ -119,8 +118,7 @@ private: static DocEntry createEntry(const QString &nameSpace, const QString &fileName, bool userManaged) { DocEntry result; - result.name = userManaged ? nameSpace - : DocSettingsPageWidget::tr("%1 (auto-detected)").arg(nameSpace); + result.name = userManaged ? nameSpace : Tr::tr("%1 (auto-detected)").arg(nameSpace); result.fileName = fileName; result.nameSpace = nameSpace; return result; @@ -196,13 +194,10 @@ DocSettingsPageWidget::DocSettingsPageWidget() setLayout(new QVBoxLayout); layout()->addWidget(groupBox); - setToolTip(QCoreApplication::translate("Help::Internal::DocSettingsPage", - "Add and remove compressed help files, .qch.", - nullptr)); - groupBox->setTitle( - QCoreApplication::translate("Help::Internal::DocSettingsPage", "Registered Documentation")); - addButton->setText(QCoreApplication::translate("Help::Internal::DocSettingsPage", "Add...")); - removeButton->setText(QCoreApplication::translate("Help::Internal::DocSettingsPage", "Remove")); + setToolTip(Tr::tr("Add and remove compressed help files, .qch.")); + groupBox->setTitle(Tr::tr("Registered Documentation")); + addButton->setText(Tr::tr("Add...")); + removeButton->setText(Tr::tr("Remove")); const QStringList nameSpaces = HelpManager::registeredNamespaces(); const QSet userDocumentationPaths = HelpManager::userDocumentationPaths(); @@ -238,9 +233,9 @@ DocSettingsPageWidget::DocSettingsPageWidget() void DocSettingsPageWidget::addDocumentation() { const FilePaths files = FileUtils::getOpenFilePaths(Core::ICore::dialogParent(), - tr("Add Documentation"), + Tr::tr("Add Documentation"), m_recentDialogPath, - tr("Qt Help Files (*.qch)")); + Tr::tr("Qt Help Files (*.qch)")); if (files.isEmpty()) return; @@ -284,7 +279,8 @@ void DocSettingsPageWidget::addDocumentation() QString formatedFail; if (docsUnableToRegister.contains("UnknownNamespace")) { - formatedFail += QString::fromLatin1("
  • %1").arg(tr("Invalid documentation file:")); + formatedFail += QString::fromLatin1("
    • %1") + .arg(Tr::tr("Invalid documentation file:")); foreach (const QString &value, docsUnableToRegister.values("UnknownNamespace")) formatedFail += QString::fromLatin1("
      • %2
      ").arg(value); formatedFail += "
    "; @@ -292,7 +288,8 @@ void DocSettingsPageWidget::addDocumentation() } if (!docsUnableToRegister.isEmpty()) { - formatedFail += QString::fromLatin1("
    • %1").arg(tr("Namespace already registered:")); + formatedFail += QString::fromLatin1("
      • %1") + .arg(Tr::tr("Namespace already registered:")); const NameSpaceToPathHash::ConstIterator cend = docsUnableToRegister.constEnd(); for (NameSpaceToPathHash::ConstIterator it = docsUnableToRegister.constBegin(); it != cend; ++it) { formatedFail += QString::fromLatin1("
        • %1 - %2
        ").arg(it.key(), it.value()); @@ -302,8 +299,8 @@ void DocSettingsPageWidget::addDocumentation() if (!formatedFail.isEmpty()) { QMessageBox::information(Core::ICore::dialogParent(), - tr("Registration Failed"), - tr("Unable to register documentation.") + formatedFail, + Tr::tr("Registration Failed"), + Tr::tr("Unable to register documentation.") + formatedFail, QMessageBox::Ok); } } @@ -378,7 +375,7 @@ QList DocSettingsPageWidget::currentSelection() const DocSettingsPage::DocSettingsPage() { setId("B.Documentation"); - setDisplayName(DocSettingsPageWidget::tr("Documentation")); + setDisplayName(Tr::tr("Documentation")); setCategory(Help::Constants::HELP_CATEGORY); setWidgetCreator([] { return new DocSettingsPageWidget; }); } diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp index ea4cfb037d7..23dd1e22ec4 100644 --- a/src/plugins/help/filtersettingspage.cpp +++ b/src/plugins/help/filtersettingspage.cpp @@ -25,6 +25,7 @@ #include "filtersettingspage.h" #include "helpconstants.h" +#include "helptr.h" #include #include @@ -36,7 +37,7 @@ using namespace Help::Internal; FilterSettingsPage::FilterSettingsPage() { setId("D.Filters"); - setDisplayName(tr("Filters")); + setDisplayName(Tr::tr("Filters")); setCategory(Help::Constants::HELP_CATEGORY); } diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index 3d7068b9a4a..f6d2284a5f1 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/src/plugins/help/generalsettingspage.cpp @@ -27,6 +27,7 @@ #include "helpconstants.h" #include "helpplugin.h" +#include "helptr.h" #include "helpviewer.h" #include "helpwidget.h" #include "localhelpmanager.h" @@ -88,17 +89,13 @@ public: GeneralSettingsPageWidget::GeneralSettingsPageWidget() { // font group box - auto fontGroupBox = new QGroupBox( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Font")); - auto familyLabel = new QLabel( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Family:")); + auto fontGroupBox = new QGroupBox(Tr::tr("Font")); + auto familyLabel = new QLabel(Tr::tr("Family:")); familyComboBox = new QFontComboBox; - auto styleLabel = new QLabel( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Style:")); + auto styleLabel = new QLabel(Tr::tr("Style:")); styleComboBox = new QComboBox; - auto sizeLabel = new QLabel( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Size:")); + auto sizeLabel = new QLabel(Tr::tr("Size:")); sizeComboBox = new QComboBox; auto fontLayout = new QHBoxLayout(); @@ -111,19 +108,17 @@ GeneralSettingsPageWidget::GeneralSettingsPageWidget() fontLayout->addWidget(sizeComboBox); fontLayout->addStretch(); - auto noteLabel = new QLabel(QCoreApplication::translate( - "Help::Internal::GeneralSettingsPage", + auto noteLabel = new QLabel(Tr::tr( "Note: The above setting takes effect only if the HTML file does not use a style sheet.")); noteLabel->setWordWrap(true); - auto zoomLabel = new QLabel( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Zoom:")); + auto zoomLabel = new QLabel(Tr::tr("Zoom:")); zoomSpinBox = new QSpinBox; zoomSpinBox->setMinimum(10); zoomSpinBox->setMaximum(3000); zoomSpinBox->setSingleStep(10); zoomSpinBox->setValue(100); - zoomSpinBox->setSuffix(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "%")); + zoomSpinBox->setSuffix(Tr::tr("%")); auto zoomLayout = new QHBoxLayout(); zoomLayout->addWidget(zoomSpinBox); @@ -138,46 +133,30 @@ GeneralSettingsPageWidget::GeneralSettingsPageWidget() fontGroupBoxLayout->addLayout(zoomLayout, 2, 1); // startup group box - auto startupGroupBox = new QGroupBox( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Startup")); + auto startupGroupBox = new QGroupBox(Tr::tr("Startup")); contextHelpComboBox = new QComboBox(startupGroupBox); - contextHelpComboBox->addItem(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", - "Show Side-by-Side if Possible")); - contextHelpComboBox->addItem(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", - "Always Show Side-by-Side")); - contextHelpComboBox->addItem(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", - "Always Show in Help Mode")); - contextHelpComboBox->addItem(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", - "Always Show in External Window")); + contextHelpComboBox->addItem(Tr::tr("Show Side-by-Side if Possible")); + contextHelpComboBox->addItem(Tr::tr("Always Show Side-by-Side")); + contextHelpComboBox->addItem(Tr::tr("Always Show in Help Mode")); + contextHelpComboBox->addItem(Tr::tr("Always Show in External Window")); helpStartComboBox = new QComboBox(startupGroupBox); - helpStartComboBox->addItem( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Show My Home Page")); - helpStartComboBox->addItem( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Show a Blank Page")); - helpStartComboBox->addItem(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", - "Show My Tabs from Last Session")); + helpStartComboBox->addItem(Tr::tr("Show My Home Page")); + helpStartComboBox->addItem(Tr::tr("Show a Blank Page")); + helpStartComboBox->addItem(Tr::tr("Show My Tabs from Last Session")); auto startupFormLayout = new QFormLayout; startupGroupBox->setLayout(startupFormLayout); startupFormLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); - startupFormLayout->addRow(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", - "On context help:"), - contextHelpComboBox); - startupFormLayout->addRow(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", - "On help start:"), - helpStartComboBox); + startupFormLayout->addRow(Tr::tr("On context help:"), contextHelpComboBox); + startupFormLayout->addRow(Tr::tr("On help start:"), helpStartComboBox); homePageLineEdit = new QLineEdit; - currentPageButton = new QPushButton( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Use &Current Page")); - blankPageButton = new QPushButton( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Use &Blank Page")); - defaultPageButton = new QPushButton( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Reset")); - defaultPageButton->setToolTip( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Reset to default.")); + currentPageButton = new QPushButton(Tr::tr("Use &Current Page")); + blankPageButton = new QPushButton(Tr::tr("Use &Blank Page")); + defaultPageButton = new QPushButton(Tr::tr("Reset")); + defaultPageButton->setToolTip(Tr::tr("Reset to default.")); auto homePageLayout = new QHBoxLayout; homePageLayout->addWidget(homePageLineEdit); @@ -185,29 +164,19 @@ GeneralSettingsPageWidget::GeneralSettingsPageWidget() homePageLayout->addWidget(blankPageButton); homePageLayout->addWidget(defaultPageButton); - startupFormLayout->addRow(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", - "Home page:"), - homePageLayout); + startupFormLayout->addRow(Tr::tr("Home page:"), homePageLayout); // behavior group box - auto behaviourGroupBox = new QGroupBox( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Behaviour")); - scrollWheelZooming = new QCheckBox( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", - "Enable scroll wheel zooming")); + auto behaviourGroupBox = new QGroupBox(Tr::tr("Behaviour")); + scrollWheelZooming = new QCheckBox(Tr::tr("Enable scroll wheel zooming")); - m_returnOnClose = new QCheckBox( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", - "Return to editor on closing the last page")); + m_returnOnClose = new QCheckBox(Tr::tr("Return to editor on closing the last page")); m_returnOnClose->setToolTip( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", - "Switches to editor context after last help page is closed.")); + Tr::tr("Switches to editor context after last help page is closed.")); - auto viewerBackendLabel = new QLabel( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Viewer backend:")); + auto viewerBackendLabel = new QLabel(Tr::tr("Viewer backend:")); viewerBackend = new QComboBox; - const QString description = GeneralSettingsPage::tr( - "Change takes effect after reloading help pages."); + const QString description = Tr::tr("Change takes effect after reloading help pages."); auto viewerBackendDescription = new QLabel(description); viewerBackendLabel->setToolTip(description); viewerBackend->setToolTip(description); @@ -236,10 +205,8 @@ GeneralSettingsPageWidget::GeneralSettingsPageWidget() palette.setBrush(QPalette::Disabled, QPalette::Text, brush1); errorLabel->setPalette(palette); - importButton = new QPushButton( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Import Bookmarks...")); - exportButton = new QPushButton( - QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Export Bookmarks...")); + importButton = new QPushButton(Tr::tr("Import Bookmarks...")); + exportButton = new QPushButton(Tr::tr("Export Bookmarks...")); auto bookmarksLayout = new QHBoxLayout(); bookmarksLayout->addStretch(); @@ -259,9 +226,9 @@ GeneralSettingsPageWidget::GeneralSettingsPageWidget() GeneralSettingsPage::GeneralSettingsPage() { setId("A.General settings"); - setDisplayName(tr("General")); + setDisplayName(Tr::tr("General")); setCategory(Help::Constants::HELP_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Help", "Help")); + setDisplayCategory(Tr::tr("Help")); setCategoryIconPath(":/help/images/settingscategory_help.png"); } @@ -332,8 +299,9 @@ QWidget *GeneralSettingsPage::widget() m_scrollWheelZoomingEnabled = LocalHelpManager::isScrollWheelZoomingEnabled(); m_widget->scrollWheelZooming->setChecked(m_scrollWheelZoomingEnabled); - m_widget->viewerBackend->addItem(tr("Default (%1)", "Default viewer backend") - .arg(LocalHelpManager::defaultViewerBackend().displayName)); + m_widget->viewerBackend->addItem( + Tr::tr("Default (%1)", "Default viewer backend") + .arg(LocalHelpManager::defaultViewerBackend().displayName)); const QByteArray currentBackend = LocalHelpManager::viewerBackendId(); const QVector backends = LocalHelpManager::viewerBackends(); for (const HelpViewerFactory &f : backends) { @@ -417,7 +385,9 @@ void GeneralSettingsPage::importBookmarks() m_widget->errorLabel->setVisible(false); FilePath filePath = FileUtils::getOpenFilePath(nullptr, - tr("Import Bookmarks"), FilePath::fromString(QDir::currentPath()), tr("Files (*.xbel)")); + Tr::tr("Import Bookmarks"), + FilePath::fromString(QDir::currentPath()), + Tr::tr("Files (*.xbel)")); if (filePath.isEmpty()) return; @@ -431,7 +401,7 @@ void GeneralSettingsPage::importBookmarks() } m_widget->errorLabel->setVisible(true); - m_widget->errorLabel->setText(tr("Cannot import bookmarks.")); + m_widget->errorLabel->setText(Tr::tr("Cannot import bookmarks.")); } void GeneralSettingsPage::exportBookmarks() @@ -439,7 +409,9 @@ void GeneralSettingsPage::exportBookmarks() m_widget->errorLabel->setVisible(false); FilePath filePath = FileUtils::getSaveFilePath(nullptr, - tr("Save File"), "untitled.xbel", tr("Files (*.xbel)")); + Tr::tr("Save File"), + "untitled.xbel", + Tr::tr("Files (*.xbel)")); QLatin1String suffix(".xbel"); if (!filePath.endsWith(suffix)) diff --git a/src/plugins/help/helpconstants.h b/src/plugins/help/helpconstants.h index 294424af7dc..baa9027f9fa 100644 --- a/src/plugins/help/helpconstants.h +++ b/src/plugins/help/helpconstants.h @@ -56,14 +56,14 @@ const char HELP_SEARCH[] = "Help.Search"; const char HELP_BOOKMARKS[] = "Help.Bookmarks"; const char HELP_OPENPAGES[] = "Help.OpenPages"; -static const char SB_INDEX[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Index"); -static const char SB_CONTENTS[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Contents"); -static const char SB_BOOKMARKS[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Bookmarks"); -static const char SB_OPENPAGES[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Open Pages"); -static const char SB_SEARCH[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Search"); +static const char SB_INDEX[] = QT_TRANSLATE_NOOP("Help", "Index"); +static const char SB_CONTENTS[] = QT_TRANSLATE_NOOP("Help", "Contents"); +static const char SB_BOOKMARKS[] = QT_TRANSLATE_NOOP("Help", "Bookmarks"); +static const char SB_OPENPAGES[] = QT_TRANSLATE_NOOP("Help", "Open Pages"); +static const char SB_SEARCH[] = QT_TRANSLATE_NOOP("Help", "Search"); -static const char TR_OPEN_LINK_AS_NEW_PAGE[] = QT_TRANSLATE_NOOP("HelpViewer", "Open Link as New Page"); -static const char TR_OPEN_LINK_IN_WINDOW[] = QT_TRANSLATE_NOOP("HelpViewer", "Open Link in Window"); +static const char TR_OPEN_LINK_AS_NEW_PAGE[] = QT_TRANSLATE_NOOP("Help", "Open Link as New Page"); +static const char TR_OPEN_LINK_IN_WINDOW[] = QT_TRANSLATE_NOOP("Help", "Open Link in Window"); } // Constants } // Help diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp index 05c55e1c79a..a60a9d3a6d9 100644 --- a/src/plugins/help/helpindexfilter.cpp +++ b/src/plugins/help/helpindexfilter.cpp @@ -27,6 +27,7 @@ #include "helpicons.h" #include "helpmanager.h" +#include "helptr.h" #include "topicchooser.h" #include @@ -48,7 +49,7 @@ using namespace Help::Internal; HelpIndexFilter::HelpIndexFilter() { setId("HelpIndexFilter"); - setDisplayName(tr("Help Index")); + setDisplayName(Tr::tr("Help Index")); setDefaultIncludedByDefault(false); setDefaultShortcutString("?"); diff --git a/src/plugins/help/helpmanager.cpp b/src/plugins/help/helpmanager.cpp index d6d94b7d981..9862855f2f2 100644 --- a/src/plugins/help/helpmanager.cpp +++ b/src/plugins/help/helpmanager.cpp @@ -25,6 +25,8 @@ #include "helpmanager.h" +#include "helptr.h" + #include #include #include @@ -126,7 +128,7 @@ void HelpManager::registerDocumentation(const QStringList &files) emit Core::HelpManager::Signals::instance()->documentationChanged(); } }); - ProgressManager::addTask(future, tr("Update Documentation"), kUpdateDocumentationTask); + ProgressManager::addTask(future, Tr::tr("Update Documentation"), kUpdateDocumentationTask); } void HelpManager::unregisterDocumentation(const QStringList &fileNames) diff --git a/src/plugins/help/helpmode.cpp b/src/plugins/help/helpmode.cpp index 3d5e20304ac..9b03789cf12 100644 --- a/src/plugins/help/helpmode.cpp +++ b/src/plugins/help/helpmode.cpp @@ -26,6 +26,7 @@ #include "helpmode.h" #include "helpconstants.h" #include "helpicons.h" +#include "helptr.h" #include @@ -39,7 +40,7 @@ HelpMode::HelpMode(QObject *parent) setContext(Core::Context(Constants::C_MODE_HELP)); setIcon(Utils::Icon::modeIcon(Icons::MODE_HELP_CLASSIC, Icons::MODE_HELP_FLAT, Icons::MODE_HELP_FLAT_ACTIVE)); - setDisplayName(QCoreApplication::translate("Help::Internal::HelpMode", "Help")); + setDisplayName(Tr::tr("Help")); setPriority(Constants::P_MODE_HELP); setId(Constants::ID_MODE_HELP); } diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 624ae6617d0..f08e49424a2 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -35,6 +35,7 @@ #include "helpindexfilter.h" #include "helpmanager.h" #include "helpmode.h" +#include "helptr.h" #include "helpviewer.h" #include "helpwidget.h" #include "localhelpmanager.h" @@ -225,18 +226,17 @@ HelpPluginPrivate::HelpPluginPrivate() QAction *action; // Add Contents, Index, and Context menu items - action = new QAction(QIcon::fromTheme("help-contents"), - HelpPlugin::tr(Constants::SB_CONTENTS), this); + action = new QAction(QIcon::fromTheme("help-contents"), Tr::tr(Constants::SB_CONTENTS), this); cmd = ActionManager::registerAction(action, "Help.ContentsMenu"); ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); connect(action, &QAction::triggered, this, &HelpPluginPrivate::activateContents); - action = new QAction(HelpPlugin::tr(Constants::SB_INDEX), this); + action = new QAction(Tr::tr(Constants::SB_INDEX), this); cmd = ActionManager::registerAction(action, "Help.IndexMenu"); ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); connect(action, &QAction::triggered, this, &HelpPluginPrivate::activateIndex); - action = new QAction(HelpPlugin::tr("Context Help"), this); + action = new QAction(Tr::tr("Context Help"), this); cmd = ActionManager::registerAction(action, Help::Constants::CONTEXT_HELP, Context(kToolTipHelpContext, Core::Constants::C_GLOBAL)); cmd->setTouchBarIcon(Icons::MACOS_TOUCHBAR_HELP.icon()); @@ -254,7 +254,7 @@ HelpPluginPrivate::HelpPluginPrivate() textEditorContextMenu->addAction(cmd, Core::Constants::G_HELP); } - action = new QAction(HelpPlugin::tr("Technical Support..."), this); + action = new QAction(Tr::tr("Technical Support..."), this); cmd = ActionManager::registerAction(action, "Help.TechSupport"); ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_SUPPORT); connect(action, &QAction::triggered, this, [this] { @@ -265,7 +265,7 @@ HelpPluginPrivate::HelpPluginPrivate() const QString qdsStandaloneEntry = "QML/Designer/StandAloneMode"; //entry from designer settings const bool isDesigner = Core::ICore::settings()->value(qdsStandaloneEntry, false).toBool(); - action = new QAction(HelpPlugin::tr("Report Bug..."), this); + action = new QAction(Tr::tr("Report Bug..."), this); cmd = ActionManager::registerAction(action, "Help.ReportBug"); ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_SUPPORT); connect(action, &QAction::triggered, this, [isDesigner] { @@ -274,7 +274,7 @@ HelpPluginPrivate::HelpPluginPrivate() QDesktopServices::openUrl(bugreportUrl); }); - action = new QAction(HelpPlugin::tr("System Information..."), this); + action = new QAction(Tr::tr("System Information..."), this); cmd = ActionManager::registerAction(action, "Help.SystemInformation"); ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_SUPPORT); connect(action, &QAction::triggered, this, &HelpPluginPrivate::slotSystemInformation); @@ -539,11 +539,11 @@ void HelpPluginPrivate::showContextHelp(const HelpItem &contextHelp) "%4
        " "%5" "") - .arg(HelpPlugin::tr("No Documentation")) + .arg(Tr::tr("No Documentation")) .arg(creatorTheme()->color(Theme::BackgroundColorNormal).name()) .arg(creatorTheme()->color(Theme::TextColorNormal).name()) .arg(contextHelp.helpIds().join(", ")) - .arg(HelpPlugin::tr("No documentation available."))); + .arg(Tr::tr("No documentation available."))); } } else if (links.size() == 1 && !contextHelp.isFuzzyMatch()) { showHelpUrl(links.front().second, LocalHelpManager::contextHelpOption()); @@ -622,10 +622,11 @@ void HelpPluginPrivate::slotSystemInformation() auto dialog = new DialogClosingOnEscape(ICore::dialogParent()); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setModal(true); - dialog->setWindowTitle(HelpPlugin::tr("System Information")); + dialog->setWindowTitle(Tr::tr("System Information")); auto layout = new QVBoxLayout; dialog->setLayout(layout); - auto intro = new QLabel(HelpPlugin::tr("Use the following to provide more detailed information about your system to bug reports:")); + auto intro = new QLabel(Tr::tr("Use the following to provide more detailed information about " + "your system to bug reports:")); intro->setWordWrap(true); layout->addWidget(intro); const QString text = "{noformat}\n" + ICore::systemInformation() + "\n{noformat}"; @@ -638,7 +639,7 @@ void HelpPluginPrivate::slotSystemInformation() layout->addWidget(info); auto buttonBox = new QDialogButtonBox; buttonBox->addButton(QDialogButtonBox::Cancel); - buttonBox->addButton(HelpPlugin::tr("Copy to Clipboard"), QDialogButtonBox::AcceptRole); + buttonBox->addButton(Tr::tr("Copy to Clipboard"), QDialogButtonBox::AcceptRole); connect(buttonBox, &QDialogButtonBox::accepted, dialog, &QDialog::accept); connect(buttonBox, &QDialogButtonBox::rejected, dialog, &QDialog::reject); layout->addWidget(buttonBox); diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp index da1054bc1c5..2470fd53e8d 100644 --- a/src/plugins/help/helpviewer.cpp +++ b/src/plugins/help/helpviewer.cpp @@ -25,6 +25,7 @@ #include "helpviewer.h" #include "helpconstants.h" +#include "helptr.h" #include "localhelpmanager.h" #include @@ -215,8 +216,9 @@ void HelpViewer::incrementZoom(int steps) void HelpViewer::applyZoom(int percentage) { const int newZoom = LocalHelpManager::setFontZoom(percentage); - Utils::FadingIndicator::showText(this, QCoreApplication::translate("Help::HelpViewer", - "Zoom: %1%").arg(newZoom), Utils::FadingIndicator::SmallText); + Utils::FadingIndicator::showText(this, + Tr::tr("Zoom: %1%").arg(newZoom), + Utils::FadingIndicator::SmallText); } void HelpViewer::slotLoadStarted() diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index 74462c643b6..bb9cce069dd 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -30,6 +30,7 @@ #include "helpconstants.h" #include "helpicons.h" #include "helpplugin.h" +#include "helptr.h" #include "helpviewer.h" #include "indexwindow.h" #include "localhelpmanager.h" @@ -95,7 +96,7 @@ QVariant OpenPagesModel::data(const QModelIndex &index, int role) const return m_parent->viewerAt(index.row())->source().toString(); case Qt::DisplayRole: { const QString title = m_parent->viewerAt(index.row())->title(); - return title.isEmpty() ? HelpWidget::tr("(Untitled)") : title; + return title.isEmpty() ? Tr::tr("(Untitled)") : title; } default: break; @@ -128,13 +129,13 @@ static QString helpTargetActionText(Core::HelpManager::HelpViewerLocation option { switch (option) { case Core::HelpManager::SideBySideIfPossible: - return HelpWidget::tr("Show Context Help Side-by-Side if Possible"); + return Tr::tr("Show Context Help Side-by-Side if Possible"); case Core::HelpManager::SideBySideAlways: - return HelpWidget::tr("Always Show Context Help Side-by-Side"); + return Tr::tr("Always Show Context Help Side-by-Side"); case Core::HelpManager::HelpModeAlways: - return HelpWidget::tr("Always Show Context Help in Help Mode"); + return Tr::tr("Always Show Context Help in Help Mode"); case Core::HelpManager::ExternalHelpAlways: - return HelpWidget::tr("Always Show Context Help in External Window"); + return Tr::tr("Always Show Context Help in External Window"); } QTC_CHECK(false); return {}; @@ -279,7 +280,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget } if (style != ModeWidget) { - m_switchToHelp = new QAction(tr("Open in Help Mode"), toolBar); + m_switchToHelp = new QAction(Tr::tr("Open in Help Mode"), toolBar); cmd = Core::ActionManager::registerAction(m_switchToHelp, Constants::CONTEXT_HELP, context); connect(m_switchToHelp, &QAction::triggered, this, [this] { postRequestShowHelpUrl(Core::HelpManager::HelpModeAlways); @@ -287,12 +288,12 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget layout->addWidget(Core::Command::toolButtonWithAppendedShortcut(m_switchToHelp, cmd)); } - m_homeAction = new QAction(Utils::Icons::HOME_TOOLBAR.icon(), tr("Home"), this); + m_homeAction = new QAction(Utils::Icons::HOME_TOOLBAR.icon(), Tr::tr("Home"), this); cmd = Core::ActionManager::registerAction(m_homeAction, Constants::HELP_HOME, context); connect(m_homeAction, &QAction::triggered, this, &HelpWidget::goHome); layout->addWidget(Core::Command::toolButtonWithAppendedShortcut(m_homeAction, cmd)); - m_backAction = new QAction(Utils::Icons::PREV_TOOLBAR.icon(), tr("Back"), toolBar); + m_backAction = new QAction(Utils::Icons::PREV_TOOLBAR.icon(), Tr::tr("Back"), toolBar); connect(m_backAction, &QAction::triggered, this, &HelpWidget::backward); m_backMenu = new QMenu(toolBar); connect(m_backMenu, &QMenu::aboutToShow, this, &HelpWidget::updateBackMenu); @@ -303,7 +304,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget button->setPopupMode(QToolButton::DelayedPopup); layout->addWidget(button); - m_forwardAction = new QAction(Utils::Icons::NEXT_TOOLBAR.icon(), tr("Forward"), toolBar); + m_forwardAction = new QAction(Utils::Icons::NEXT_TOOLBAR.icon(), Tr::tr("Forward"), toolBar); connect(m_forwardAction, &QAction::triggered, this, &HelpWidget::forward); m_forwardMenu = new QMenu(toolBar); connect(m_forwardMenu, &QMenu::aboutToShow, this, &HelpWidget::updateForwardMenu); @@ -314,14 +315,19 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget button->setPopupMode(QToolButton::DelayedPopup); layout->addWidget(button); - m_addBookmarkAction = new QAction(Utils::Icons::BOOKMARK_TOOLBAR.icon(), tr("Add Bookmark"), this); + m_addBookmarkAction = new QAction(Utils::Icons::BOOKMARK_TOOLBAR.icon(), + Tr::tr("Add Bookmark"), + this); cmd = Core::ActionManager::registerAction(m_addBookmarkAction, Constants::HELP_ADDBOOKMARK, context); - cmd->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+M") : tr("Ctrl+M"))); + cmd->setDefaultKeySequence( + QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+M") : Tr::tr("Ctrl+M"))); connect(m_addBookmarkAction, &QAction::triggered, this, &HelpWidget::addBookmark); layout->addWidget(new Utils::StyledSeparator(toolBar)); layout->addWidget(Core::Command::toolButtonWithAppendedShortcut(m_addBookmarkAction, cmd)); - m_openOnlineDocumentationAction = new QAction(Utils::Icons::ONLINE_TOOLBAR.icon(), tr("Open Online Documentation..."), this); + m_openOnlineDocumentationAction = new QAction(Utils::Icons::ONLINE_TOOLBAR.icon(), + Tr::tr("Open Online Documentation..."), + this); cmd = Core::ActionManager::registerAction(m_openOnlineDocumentationAction, Constants::HELP_OPENONLINE, context); connect(m_openOnlineDocumentationAction, &QAction::triggered, this, &HelpWidget::openOnlineDocumentation); layout->addWidget( @@ -411,19 +417,19 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget Core::ActionContainer *advancedMenu = Core::ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED); if (QTC_GUARD(advancedMenu)) { // reuse TextEditor constants to avoid a second pair of menu actions - m_scaleUp = new QAction(tr("Increase Font Size"), this); + m_scaleUp = new QAction(Tr::tr("Increase Font Size"), this); cmd = Core::ActionManager::registerAction(m_scaleUp, TextEditor::Constants::INCREASE_FONT_SIZE, context); connect(m_scaleUp, &QAction::triggered, this, &HelpWidget::scaleUp); advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT); - m_scaleDown = new QAction(tr("Decrease Font Size"), this); + m_scaleDown = new QAction(Tr::tr("Decrease Font Size"), this); cmd = Core::ActionManager::registerAction(m_scaleDown, TextEditor::Constants::DECREASE_FONT_SIZE, context); connect(m_scaleDown, &QAction::triggered, this, &HelpWidget::scaleDown); advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT); - m_resetScale = new QAction(tr("Reset Font Size"), this); + m_resetScale = new QAction(Tr::tr("Reset Font Size"), this); cmd = Core::ActionManager::registerAction(m_resetScale, TextEditor::Constants::RESET_FONT_SIZE, context); connect(m_resetScale, &QAction::triggered, this, &HelpWidget::resetScale); @@ -441,20 +447,20 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget if (m_switchToHelp) openMenu->addAction(m_switchToHelp); if (style != SideBarWidget) { - QAction *openSideBySide = openMenu->addAction(tr("Open in Edit Mode")); + QAction *openSideBySide = openMenu->addAction(Tr::tr("Open in Edit Mode")); connect(openSideBySide, &QAction::triggered, this, [this]() { postRequestShowHelpUrl(Core::HelpManager::SideBySideAlways); }); } if (supportsPages()) { - QAction *openPage = openMenu->addAction(tr("Open in New Page")); + QAction *openPage = openMenu->addAction(Tr::tr("Open in New Page")); connect(openPage, &QAction::triggered, this, [this]() { if (HelpViewer *viewer = currentViewer()) openNewPage(viewer->source()); }); } if (style != ExternalWindow) { - QAction *openExternal = openMenu->addAction(tr("Open in Window")); + QAction *openExternal = openMenu->addAction(Tr::tr("Open in Window")); connect(openExternal, &QAction::triggered, this, [this]() { postRequestShowHelpUrl(Core::HelpManager::ExternalHelpAlways); }); @@ -473,7 +479,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget button->setDefaultAction(m_closeAction); layout->addWidget(button); - QAction *reload = openMenu->addAction(tr("Reload")); + QAction *reload = openMenu->addAction(Tr::tr("Reload")); connect(reload, &QAction::triggered, this, [this]() { const int index = m_viewerStack->currentIndex(); HelpViewer *previous = currentViewer(); @@ -492,7 +498,7 @@ void HelpWidget::setupFilterCombo() { const QString currentFilter = LocalHelpManager::filterEngine()->activeFilter(); m_filterComboBox->clear(); - m_filterComboBox->addItem(tr("Unfiltered")); + m_filterComboBox->addItem(Tr::tr("Unfiltered")); const QStringList allFilters = LocalHelpManager::filterEngine()->filters(); if (!allFilters.isEmpty()) m_filterComboBox->insertSeparator(1); @@ -568,58 +574,58 @@ void HelpWidget::addSideBar() auto contentWindow = new ContentWindow; auto contentItem = new Core::SideBarItem(contentWindow, Constants::HELP_CONTENTS); contentWindow->setOpenInNewPageActionVisible(supportsPages()); - contentWindow->setWindowTitle(HelpPlugin::tr(Constants::SB_CONTENTS)); + contentWindow->setWindowTitle(Tr::tr(Constants::SB_CONTENTS)); connect(contentWindow, &ContentWindow::linkActivated, this, &HelpWidget::open); - m_contentsAction = new QAction(HelpPlugin::tr(Constants::SB_CONTENTS), this); + m_contentsAction = new QAction(Tr::tr(Constants::SB_CONTENTS), this); cmd = Core::ActionManager::registerAction(m_contentsAction, Constants::HELP_CONTENTS, m_context->context()); - cmd->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+Shift+C") - : tr("Ctrl+Shift+C"))); + cmd->setDefaultKeySequence( + QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+Shift+C") : Tr::tr("Ctrl+Shift+C"))); shortcutMap.insert(Constants::HELP_CONTENTS, cmd); auto indexWindow = new IndexWindow(); auto indexItem = new Core::SideBarItem(indexWindow, Constants::HELP_INDEX); indexWindow->setOpenInNewPageActionVisible(supportsPages()); - indexWindow->setWindowTitle(HelpPlugin::tr(Constants::SB_INDEX)); + indexWindow->setWindowTitle(Tr::tr(Constants::SB_INDEX)); connect(indexWindow, &IndexWindow::linksActivated, this, &HelpWidget::showLinks); - m_indexAction = new QAction(HelpPlugin::tr(Constants::SB_INDEX), this); + m_indexAction = new QAction(Tr::tr(Constants::SB_INDEX), this); cmd = Core::ActionManager::registerAction(m_indexAction, Constants::HELP_INDEX, m_context->context()); - cmd->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+I") - : tr("Ctrl+Shift+I"))); + cmd->setDefaultKeySequence( + QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I") : Tr::tr("Ctrl+Shift+I"))); shortcutMap.insert(Constants::HELP_INDEX, cmd); auto bookmarkWidget = new BookmarkWidget(&LocalHelpManager::bookmarkManager()); - bookmarkWidget->setWindowTitle(HelpPlugin::tr(Constants::SB_BOOKMARKS)); + bookmarkWidget->setWindowTitle(Tr::tr(Constants::SB_BOOKMARKS)); bookmarkWidget->setOpenInNewPageActionVisible(supportsPages()); auto bookmarkItem = new Core::SideBarItem(bookmarkWidget, Constants::HELP_BOOKMARKS); connect(bookmarkWidget, &BookmarkWidget::linkActivated, this, &HelpWidget::setSource); - m_bookmarkAction = new QAction(tr("Activate Help Bookmarks View"), this); + m_bookmarkAction = new QAction(Tr::tr("Activate Help Bookmarks View"), this); cmd = Core::ActionManager::registerAction(m_bookmarkAction, Constants::HELP_BOOKMARKS, m_context->context()); - cmd->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Alt+Meta+M") - : tr("Ctrl+Shift+B"))); + cmd->setDefaultKeySequence( + QKeySequence(Core::useMacShortcuts ? Tr::tr("Alt+Meta+M") : Tr::tr("Ctrl+Shift+B"))); shortcutMap.insert(Constants::HELP_BOOKMARKS, cmd); auto searchItem = new SearchSideBarItem; connect(searchItem, &SearchSideBarItem::linkActivated, this, &HelpWidget::openFromSearch); - m_searchAction = new QAction(tr("Activate Help Search View"), this); + m_searchAction = new QAction(Tr::tr("Activate Help Search View"), this); cmd = Core::ActionManager::registerAction(m_searchAction, Constants::HELP_SEARCH, m_context->context()); - cmd->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+/") - : tr("Ctrl+Shift+/"))); + cmd->setDefaultKeySequence( + QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+/") : Tr::tr("Ctrl+Shift+/"))); shortcutMap.insert(Constants::HELP_SEARCH, cmd); Core::SideBarItem *openPagesItem = nullptr; QWidget *openPagesWidget = m_openPagesManager->openPagesWidget(); - openPagesWidget->setWindowTitle(HelpPlugin::tr(Constants::SB_OPENPAGES)); + openPagesWidget->setWindowTitle(Tr::tr(Constants::SB_OPENPAGES)); openPagesItem = new Core::SideBarItem(openPagesWidget, Constants::HELP_OPENPAGES); - m_openPagesAction = new QAction(tr("Activate Open Help Pages View"), this); + m_openPagesAction = new QAction(Tr::tr("Activate Open Help Pages View"), this); cmd = Core::ActionManager::registerAction(m_openPagesAction, Constants::HELP_OPENPAGES, m_context->context()); cmd->setDefaultKeySequence( - QKeySequence(Core::useMacShortcuts ? tr("Meta+O") : tr("Ctrl+Shift+O"))); + QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+O") : Tr::tr("Ctrl+Shift+O"))); shortcutMap.insert(Constants::HELP_OPENPAGES, cmd); QList itemList = {contentItem, indexItem, bookmarkItem, searchItem}; @@ -862,9 +868,9 @@ void HelpWidget::updateWindowTitle() QTC_ASSERT(currentViewer(), return); const QString pageTitle = currentViewer()->title(); if (pageTitle.isEmpty()) - setWindowTitle(tr("Help")); + setWindowTitle(Tr::tr("Help")); else - setWindowTitle(tr("Help - %1").arg(pageTitle)); + setWindowTitle(Tr::tr("Help - %1").arg(pageTitle)); } void HelpWidget::postRequestShowHelpUrl(Core::HelpManager::HelpViewerLocation location) @@ -989,7 +995,7 @@ void HelpWidget::print(HelpViewer *viewer) if (!m_printer) m_printer = new QPrinter(QPrinter::HighResolution); QPrintDialog dlg(m_printer, this); - dlg.setWindowTitle(tr("Print Documentation")); + dlg.setWindowTitle(Tr::tr("Print Documentation")); if (!viewer->selectedText().isEmpty()) dlg.setOption(QAbstractPrintDialog::PrintSelection, true); dlg.setOption(QAbstractPrintDialog::PrintPageRange, true); diff --git a/src/plugins/help/litehtmlhelpviewer.cpp b/src/plugins/help/litehtmlhelpviewer.cpp index 4e1c697bed2..b2d064412ed 100644 --- a/src/plugins/help/litehtmlhelpviewer.cpp +++ b/src/plugins/help/litehtmlhelpviewer.cpp @@ -26,6 +26,7 @@ #include "litehtmlhelpviewer.h" #include "helpconstants.h" +#include "helptr.h" #include "localhelpmanager.h" #include @@ -290,22 +291,20 @@ void LiteHtmlHelpViewer::showContextMenu(const QPoint &pos, const QUrl &url) QAction *copyAnchorAction = nullptr; if (!url.isEmpty() && url.isValid()) { if (isActionVisible(HelpViewer::Action::NewPage)) { - QAction *action = menu.addAction( - QCoreApplication::translate("HelpViewer", Constants::TR_OPEN_LINK_AS_NEW_PAGE)); + QAction *action = menu.addAction(Tr::tr(Constants::TR_OPEN_LINK_AS_NEW_PAGE)); connect(action, &QAction::triggered, this, [this, url]() { emit newPageRequested(url); }); } if (isActionVisible(HelpViewer::Action::ExternalWindow)) { - QAction *action = menu.addAction( - QCoreApplication::translate("HelpViewer", Constants::TR_OPEN_LINK_IN_WINDOW)); + QAction *action = menu.addAction(Tr::tr(Constants::TR_OPEN_LINK_IN_WINDOW)); connect(action, &QAction::triggered, this, [this, url]() { emit externalPageRequested(url); }); } - copyAnchorAction = menu.addAction(tr("Copy Link")); + copyAnchorAction = menu.addAction(Tr::tr("Copy Link")); } else if (!m_viewer->selectedText().isEmpty()) { - connect(menu.addAction(tr("Copy")), &QAction::triggered, this, &HelpViewer::copy); + connect(menu.addAction(Tr::tr("Copy")), &QAction::triggered, this, &HelpViewer::copy); } if (copyAnchorAction == menu.exec(m_viewer->mapToGlobal(pos))) diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp index 30eabc65e6c..31575a8d980 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/src/plugins/help/localhelpmanager.cpp @@ -28,6 +28,7 @@ #include "bookmarkmanager.h" #include "helpconstants.h" #include "helpmanager.h" +#include "helptr.h" #include "helpviewer.h" #include "textbrowserhelpviewer.h" @@ -328,7 +329,7 @@ QVector LocalHelpManager::viewerBackends() { QVector result; #ifdef QTC_LITEHTML_HELPVIEWER - result.append({"litehtml", tr("litehtml"), []() { return new LiteHtmlHelpViewer; }}); + result.append({"litehtml", Tr::tr("litehtml"), []() { return new LiteHtmlHelpViewer; }}); #endif #ifdef QTC_WEBENGINE_HELPVIEWER static bool schemeRegistered = false; @@ -338,11 +339,12 @@ QVector LocalHelpManager::viewerBackends() scheme.setFlags(QWebEngineUrlScheme::LocalScheme | QWebEngineUrlScheme::LocalAccessAllowed); QWebEngineUrlScheme::registerScheme(scheme); } - result.append({"qtwebengine", tr("QtWebEngine"), []() { return new WebEngineHelpViewer; }}); + result.append({"qtwebengine", Tr::tr("QtWebEngine"), []() { return new WebEngineHelpViewer; }}); #endif - result.append({"textbrowser", tr("QTextBrowser"), []() { return new TextBrowserHelpViewer; }}); + result.append( + {"textbrowser", Tr::tr("QTextBrowser"), []() { return new TextBrowserHelpViewer; }}); #ifdef QTC_MAC_NATIVE_HELPVIEWER - result.append({"native", tr("WebKit"), []() { return new MacWebKitHelpViewer; }}); + result.append({"native", Tr::tr("WebKit"), []() { return new MacWebKitHelpViewer; }}); #endif #ifdef QTC_DEFAULT_HELPVIEWER_BACKEND const int index = Utils::indexOf(result, [](const HelpViewerFactory &f) { @@ -472,15 +474,15 @@ QByteArray LocalHelpManager::loadErrorMessage(const QUrl &url, const QString &er ""; // some of the values we will replace %1...6 inside the former html - const QString g_percent1 = QCoreApplication::translate("Help", "Error loading page"); + const QString g_percent1 = Tr::tr("Error loading page"); // percent2 will be the error details // percent3 will be the url of the page we got the error from - const QString g_percent4 = QCoreApplication::translate("Help", "

        Check that you have the corresponding " - "documentation set installed.

        "); + const QString g_percent4 = Tr::tr("

        Check that you have the corresponding " + "documentation set installed.

        "); - return QString::fromLatin1(g_htmlPage).arg(g_percent1, errorString, - QCoreApplication::translate("Help", "Error loading: %1").arg(url.toString()), - g_percent4).toUtf8(); + return QString::fromLatin1(g_htmlPage) + .arg(g_percent1, errorString, Tr::tr("Error loading: %1").arg(url.toString()), g_percent4) + .toUtf8(); } LocalHelpManager::HelpData LocalHelpManager::helpData(const QUrl &url) @@ -495,8 +497,7 @@ LocalHelpManager::HelpData LocalHelpManager::helpData(const QUrl &url) if (data.mimeType.isEmpty()) data.mimeType = "application/octet-stream"; } else { - data.data = loadErrorMessage(url, QCoreApplication::translate( - "Help", "The page could not be found")); + data.data = loadErrorMessage(url, Tr::tr("The page could not be found")); data.mimeType = "text/html"; } return data; diff --git a/src/plugins/help/macwebkithelpviewer.mm b/src/plugins/help/macwebkithelpviewer.mm index be8a1c1c17c..ed239754f49 100644 --- a/src/plugins/help/macwebkithelpviewer.mm +++ b/src/plugins/help/macwebkithelpviewer.mm @@ -26,6 +26,7 @@ #include "macwebkithelpviewer.h" #include "helpconstants.h" +#include "helptr.h" #include "localhelpmanager.h" #include "openpagesmanager.h" @@ -347,11 +348,15 @@ static NSMenuItem *menuItem(NSURL *url, id target, SEL action, const QString &ti NSURL *url = [element objectForKey:WebElementLinkURLKey]; if (QTC_GUARD(url)) { if (widget->viewer()->isActionVisible(Help::Internal::HelpViewer::Action::NewPage)) - [ret addObject:menuItem(url, self, @selector(openAsNewPage:), - QCoreApplication::translate("HelpViewer", Help::Constants::TR_OPEN_LINK_AS_NEW_PAGE))]; + [ret addObject:menuItem(url, + self, + @selector(openAsNewPage:), + Tr::tr(Help::Constants::TR_OPEN_LINK_AS_NEW_PAGE))]; if (widget->viewer()->isActionVisible(Help::Internal::HelpViewer::Action::ExternalWindow)) - [ret addObject:menuItem(url, self, @selector(openInWindow:), - QCoreApplication::translate("HelpViewer", Help::Constants::TR_OPEN_LINK_IN_WINDOW))]; + [ret addObject:menuItem(url, + self, + @selector(openInWindow:), + Tr::tr(Help::Constants::TR_OPEN_LINK_IN_WINDOW))]; } break; } diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp index 4fa96c341b7..62683ef897e 100644 --- a/src/plugins/help/openpagesmanager.cpp +++ b/src/plugins/help/openpagesmanager.cpp @@ -26,6 +26,7 @@ #include "openpagesmanager.h" #include "helpconstants.h" +#include "helptr.h" #include "helpviewer.h" #include "helpwidget.h" #include "localhelpmanager.h" @@ -249,7 +250,7 @@ void OpenPagesManager::openPagesContextMenu(const QPoint &point) return; QMenu menu; - menu.addAction(tr("Copy Full Path to Clipboard")); + menu.addAction(Tr::tr("Copy Full Path to Clipboard")); if (menu.exec(m_comboBox->mapToGlobal(point))) QApplication::clipboard()->setText(fileName); } diff --git a/src/plugins/help/openpageswidget.cpp b/src/plugins/help/openpageswidget.cpp index 0704627a973..c356748bd7d 100644 --- a/src/plugins/help/openpageswidget.cpp +++ b/src/plugins/help/openpageswidget.cpp @@ -25,6 +25,8 @@ #include "openpageswidget.h" +#include "helptr.h" + #include #include @@ -85,8 +87,9 @@ void OpenPagesWidget::contextMenuRequested(QPoint pos) index = index.sibling(index.row(), 0); QMenu contextMenu; const QString displayString = Utils::quoteAmpersands(index.data().toString()); - QAction *closeEditor = contextMenu.addAction(tr("Close %1").arg(displayString)); - QAction *closeOtherEditors = contextMenu.addAction(tr("Close All Except %1").arg(displayString)); + QAction *closeEditor = contextMenu.addAction(Tr::tr("Close %1").arg(displayString)); + QAction *closeOtherEditors = contextMenu.addAction( + Tr::tr("Close All Except %1").arg(displayString)); if (model()->rowCount() == 1) { closeEditor->setEnabled(false); diff --git a/src/plugins/help/searchtaskhandler.cpp b/src/plugins/help/searchtaskhandler.cpp index 8df2a715654..36f6e249290 100644 --- a/src/plugins/help/searchtaskhandler.cpp +++ b/src/plugins/help/searchtaskhandler.cpp @@ -25,6 +25,8 @@ #include "searchtaskhandler.h" +#include "helptr.h" + #include #include @@ -46,5 +48,5 @@ void SearchTaskHandler::handle(const ProjectExplorer::Task &task) QAction *SearchTaskHandler::createAction(QObject *parent) const { - return new QAction(tr("Get Help Online"), parent); + return new QAction(Tr::tr("Get Help Online"), parent); } diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp index 99793d41114..70a8d0c8435 100644 --- a/src/plugins/help/searchwidget.cpp +++ b/src/plugins/help/searchwidget.cpp @@ -26,6 +26,7 @@ #include "searchwidget.h" #include "helpconstants.h" #include "helpplugin.h" +#include "helptr.h" #include "localhelpmanager.h" #include "openpagesmanager.h" @@ -113,7 +114,7 @@ void SearchWidget::showEvent(QShowEvent *event) tbLayout->setSpacing(6); tbLayout->setContentsMargins(4, 4, 4, 4); tbLayout->addWidget(m_queryWidget); - m_indexingDocumentationLabel = new QLabel(tr("Indexing Documentation"), toolbar); + m_indexingDocumentationLabel = new QLabel(Tr::tr("Indexing Documentation"), toolbar); m_indexingDocumentationLabel->hide(); tbLayout->addWidget(m_indexingDocumentationLabel); toolbar->setLayout(tbLayout); @@ -180,9 +181,11 @@ void SearchWidget::indexingStarted() { Q_ASSERT(!m_progress); m_progress = new QFutureInterface(); - Core::ProgressManager::addTask(m_progress->future(), tr("Indexing Documentation"), "Help.Indexer"); + Core::ProgressManager::addTask(m_progress->future(), + Tr::tr("Indexing Documentation"), + "Help.Indexer"); m_progress->setProgressRange(0, 2); - m_progress->setProgressValueAndText(1, tr("Indexing Documentation")); + m_progress->setProgressValueAndText(1, Tr::tr("Indexing Documentation")); m_progress->reportStarted(); connect(&m_watcher, &QFutureWatcherBase::canceled, @@ -243,13 +246,16 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent) if (!link.isEmpty() && link.isValid()) { if (link.isRelative()) link = browser->source().resolved(link); - openLink = menu.addAction(tr("Open Link")); - openLinkInNewTab = menu.addAction(tr("Open Link as New Page")); - copyAnchorAction = menu.addAction(tr("Copy Link")); + openLink = menu.addAction(Tr::tr("Open Link")); + openLinkInNewTab = menu.addAction(Tr::tr("Open Link as New Page")); + copyAnchorAction = menu.addAction(Tr::tr("Copy Link")); } else if (browser->textCursor().hasSelection()) { - connect(menu.addAction(tr("Copy")), &QAction::triggered, browser, &QTextEdit::copy); + connect(menu.addAction(Tr::tr("Copy")), &QAction::triggered, browser, &QTextEdit::copy); } else { - connect(menu.addAction(tr("Reload")), &QAction::triggered, browser, &QTextBrowser::reload); + connect(menu.addAction(Tr::tr("Reload")), + &QAction::triggered, + browser, + &QTextBrowser::reload); } QAction *usedAction = menu.exec(mapToGlobal(contextMenuEvent->pos())); @@ -271,7 +277,7 @@ QStringList SearchWidget::currentSearchTerms() const SearchSideBarItem::SearchSideBarItem() : SideBarItem(new SearchWidget, Constants::HELP_SEARCH) { - widget()->setWindowTitle(HelpPlugin::tr(Constants::SB_SEARCH)); + widget()->setWindowTitle(Tr::tr(Constants::SB_SEARCH)); connect(static_cast(widget()), &SearchWidget::linkActivated, this, &SearchSideBarItem::linkActivated); } @@ -280,7 +286,7 @@ QList SearchSideBarItem::createToolBarWidgets() { auto reindexButton = new QToolButton; reindexButton->setIcon(Utils::Icons::RELOAD_TOOLBAR.icon()); - reindexButton->setToolTip(tr("Regenerate Index")); + reindexButton->setToolTip(Tr::tr("Regenerate Index")); connect(reindexButton, &QAbstractButton::clicked, static_cast(widget()), &SearchWidget::reindexDocumentation); return {reindexButton}; diff --git a/src/plugins/help/textbrowserhelpviewer.cpp b/src/plugins/help/textbrowserhelpviewer.cpp index 6447190ca96..a4c72ac6f21 100644 --- a/src/plugins/help/textbrowserhelpviewer.cpp +++ b/src/plugins/help/textbrowserhelpviewer.cpp @@ -26,6 +26,7 @@ #include "textbrowserhelpviewer.h" #include "helpconstants.h" +#include "helptr.h" #include "localhelpmanager.h" #include @@ -319,25 +320,25 @@ void TextBrowserHelpWidget::contextMenuEvent(QContextMenuEvent *event) QAction *copyAnchorAction = nullptr; const QUrl link(linkAt(event->pos())); if (!link.isEmpty() && link.isValid()) { - QAction *action = menu.addAction(tr("Open Link")); + QAction *action = menu.addAction(Tr::tr("Open Link")); connect(action, &QAction::triggered, this, [this, link]() { setSource(link); }); if (m_parent->isActionVisible(HelpViewer::Action::NewPage)) { - action = menu.addAction(QCoreApplication::translate("HelpViewer", Constants::TR_OPEN_LINK_AS_NEW_PAGE)); + action = menu.addAction(Tr::tr(Constants::TR_OPEN_LINK_AS_NEW_PAGE)); connect(action, &QAction::triggered, this, [this, link]() { emit m_parent->newPageRequested(link); }); } if (m_parent->isActionVisible(HelpViewer::Action::ExternalWindow)) { - action = menu.addAction(QCoreApplication::translate("HelpViewer", Constants::TR_OPEN_LINK_IN_WINDOW)); + action = menu.addAction(Tr::tr(Constants::TR_OPEN_LINK_IN_WINDOW)); connect(action, &QAction::triggered, this, [this, link]() { emit m_parent->externalPageRequested(link); }); } - copyAnchorAction = menu.addAction(tr("Copy Link")); + copyAnchorAction = menu.addAction(Tr::tr("Copy Link")); } else if (!textCursor().selectedText().isEmpty()) { - connect(menu.addAction(tr("Copy")), &QAction::triggered, this, &QTextEdit::copy); + connect(menu.addAction(Tr::tr("Copy")), &QAction::triggered, this, &QTextEdit::copy); } if (copyAnchorAction == menu.exec(event->globalPos())) diff --git a/src/plugins/help/webenginehelpviewer.cpp b/src/plugins/help/webenginehelpviewer.cpp index 7ece25833ff..8c03df0faa7 100644 --- a/src/plugins/help/webenginehelpviewer.cpp +++ b/src/plugins/help/webenginehelpviewer.cpp @@ -147,8 +147,7 @@ WebEngineHelpViewer::WebEngineHelpViewer(QWidget *parent) : }); QAction* action = m_widget->pageAction(QWebEnginePage::OpenLinkInNewTab); - action->setText(QCoreApplication::translate("HelpViewer", - Constants::TR_OPEN_LINK_AS_NEW_PAGE)); + action->setText(Tr::tr(Constants::TR_OPEN_LINK_AS_NEW_PAGE)); QWebEnginePage *viewPage = m_widget->page(); QTC_ASSERT(viewPage, return); @@ -358,16 +357,14 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) QUrl url = page()->contextMenuData().linkUrl(); #endif if (m_viewer->isActionVisible(HelpViewer::Action::NewPage)) { - auto openLink = new QAction(QCoreApplication::translate("HelpViewer", - Constants::TR_OPEN_LINK_AS_NEW_PAGE), menu); + auto openLink = new QAction(Tr::tr(Constants::TR_OPEN_LINK_AS_NEW_PAGE), menu); connect(openLink, &QAction::triggered, m_viewer, [this, url] { m_viewer->newPageRequested(url); }); menu->insertAction(before, openLink); } if (m_viewer->isActionVisible(HelpViewer::Action::ExternalWindow)) { - auto openLink = new QAction(QCoreApplication::translate("HelpViewer", - Constants::TR_OPEN_LINK_IN_WINDOW), menu); + auto openLink = new QAction(Tr::tr(Constants::TR_OPEN_LINK_IN_WINDOW), menu); connect(openLink, &QAction::triggered, m_viewer, [this, url] { m_viewer->externalPageRequested(url); }); diff --git a/src/plugins/help/xbelsupport.cpp b/src/plugins/help/xbelsupport.cpp index f711fbde8fc..f9a4812b089 100644 --- a/src/plugins/help/xbelsupport.cpp +++ b/src/plugins/help/xbelsupport.cpp @@ -25,6 +25,8 @@ #include "xbelsupport.h" +#include "helptr.h" + #include #include @@ -114,7 +116,7 @@ bool XbelReader::readFromFile(QIODevice *device) && attributes().value("version") == QLatin1String("1.0")) { readXBEL(); } else { - raiseError(QCoreApplication::translate("Help::Internal::XbelReader", "The file is not an XBEL version 1.0 file.")); + raiseError(Tr::tr("The file is not an XBEL version 1.0 file.")); } } } @@ -186,7 +188,7 @@ void XbelReader::readBookmark(QStandardItem *item) { QStandardItem *bookmark = createChildItem(item); bookmark->setIcon(bookmarkIcon); - bookmark->setText(QCoreApplication::translate("Help::Internal::XbelReader", "Unknown title")); + bookmark->setText(Tr::tr("Unknown title")); bookmark->setData(attributes().value("href").toString(), Qt::UserRole + 10); diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp index 8fe33563431..bc0b85c5001 100644 --- a/src/shared/help/indexwindow.cpp +++ b/src/shared/help/indexwindow.cpp @@ -27,6 +27,7 @@ #include "topicchooser.h" +#include #include #include #include @@ -68,7 +69,7 @@ IndexWindow::IndexWindow() m_searchLineEdit->installEventFilter(this); m_searchLineEdit->setAttribute(Qt::WA_MacShowFocusRect, false); - QLabel *l = new QLabel(tr("&Look for:")); + QLabel *l = new QLabel(Tr::tr("&Look for:")); l->setBuddy(m_searchLineEdit); layout->addWidget(l); layout->setContentsMargins(0, 0, 0, 0); @@ -154,10 +155,10 @@ bool IndexWindow::eventFilter(QObject *obj, QEvent *e) QModelIndex idx = m_indexWidget->indexAt(ctxtEvent->pos()); if (idx.isValid()) { QMenu menu; - QAction *curTab = menu.addAction(tr("Open Link")); + QAction *curTab = menu.addAction(Tr::tr("Open Link")); QAction *newTab = 0; if (m_isOpenInNewPageActionVisible) - newTab = menu.addAction(tr("Open Link as New Page")); + newTab = menu.addAction(Tr::tr("Open Link as New Page")); menu.move(m_indexWidget->mapToGlobal(ctxtEvent->pos())); QAction *action = menu.exec();