diff --git a/doc/qtcreator/src/editors/creator-code-syntax.qdoc b/doc/qtcreator/src/editors/creator-code-syntax.qdoc index e2888c25ca3..f59ba0fd941 100644 --- a/doc/qtcreator/src/editors/creator-code-syntax.qdoc +++ b/doc/qtcreator/src/editors/creator-code-syntax.qdoc @@ -68,7 +68,7 @@ To specify the position where the annotations are displayed, go to \preferences > \uicontrol {Text Editor} > - \uicontrol Display > \uicontrol {Line annotations}, and then select + \uicontrol Display > \uicontrol {Line Annotations}, and then select whether to display the annotations directly next to the code, aligned to the right of the code, or in the right margin. Showing annotations between lines can be useful if there is usually not enough space to diff --git a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc index 5fa0f05c1a1..a678e094636 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc @@ -747,7 +747,7 @@ \li Re-run tests, as determined by \uicontrol {Repetition mode}. Set the maximum number of times for repeating a test in \uicontrol {Count}. \row - \li \uicontrol {Run in parallel} + \li \uicontrol {Run in Parallel} \li Run the tests in parallel using the specified number of \uicontrol {Jobs}. In \uicontrol {Test load}, limit the parallel execution. CTest will not start a new test if it would cause the diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc index 5d78d8345cf..61613519c3d 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc @@ -63,7 +63,7 @@ \li To determine whether the keywords in the whole project, in the current file, or in a subproject are displayed by default, select - the appropriate option in the \uicontrol {Scanning scope} group. + the appropriate option in the \uicontrol {Scanning Scope} group. \endlist diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 94bbf49d0b3..86929dc6043 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -764,7 +764,7 @@ Automaticky vkládat středníky a uzavírající závorky, kulaté závorky, složené závorky a uvozovky, když je to vhodné. - &Automatically insert matching characters + &Automatically Insert Matching Characters &Automaticky vložit odpovídající znaky @@ -2008,7 +2008,7 @@ Chcete je nechat přepsat? Když je to vhodné, automaticky vkládat středníky a uzavírající závorky, kulaté závorky, složené závorky a uvozovky. - &Automatically insert matching characters + &Automatically Insert Matching Characters &Automaticky vložit odpovídající znaky @@ -40550,7 +40550,7 @@ Určuje chování odsazení se zřetelem k navazujícím řádkům. Nastavit znovu - Scanning scope + Scanning Scope Oblast prohledávání diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index ca9e8e47a43..b3ed8b9063c 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -33804,7 +33804,7 @@ Derudover indsætter Skift+Enter et undvigetegn ved markørens placering og flyt Opdel strenge automatisk - &Automatically insert matching characters + &Automatically Insert Matching Characters &Indsæt automatisk matchende tegn @@ -33984,7 +33984,7 @@ Derudover indsætter Skift+Enter et undvigetegn ved markørens placering og flyt Justeret til højre side - Line annotations + Line Annotations Linjeannotationer @@ -35591,7 +35591,7 @@ Vil blive anvendt på blanktegn i kommentarer og strenge. Nulstil - Scanning scope + Scanning Scope Skanningsområde diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 3bc759bf32b..ae81271da8c 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -10495,7 +10495,7 @@ Locked components cannot be modified or selected. Pfad des JDK existiert und ist schreibbar. - Android OpenSSL settings (Optional) + Android OpenSSL Settings (Optional) OpenSSL-Einstellungen für Android (optional) @@ -13108,7 +13108,7 @@ Dies könnte Probleme während der Ausführung verursachen. Tests wiederholen - Run in parallel + Run in Parallel Parallel ausführen @@ -16992,8 +16992,8 @@ Das integrierte Codemodell übernimmt das Einrücken. Beachten Sie, dass das aktuelle Projekt eine .clang-format-Datei enthält, welche für das Einrücken und die Formatierung von Code verwendet werden wird. - ClangFormat settings: - Einstellungen für ClangFormat: + ClangFormat Settings + Einstellungen für ClangFormat Indenting only @@ -23349,9 +23349,9 @@ Diese Präfixe werden zusätzlich zum Dateinamen beim Wechseln zwischen Header- Normalerweise werden Argumente als konstante Referenz übergeben. Das Argument wird als Wert übergeben, wenn der Typ einer der folgenden ist. Namensräume und Vorlagenargumente werden entfernt. Der wirkliche Typ muss den angegebenen Typ enthalten. Zum Beispiel passt "int" zu "int32_t", aber nicht zu "vector<int>". "vector" passt zu "std::pmr::vector<int>", aber nicht zu "std::optional<vector<int>>" - Value types: + Value Types https://learn.microsoft.com/de-de/cpp/cpp/value-types-modern-cpp - Werttypen: + Werttypen Return non-value types by const reference @@ -23725,7 +23725,7 @@ Das integrierte Codemodell übernimmt Syntaxhervorhebung, Code-Vervollständigun Zeitabstand für das Aktualisieren von Dokumenten: - Sessions with a single clangd instance + Sessions with a Single Clangd Instance Sitzungen mit einer einzigen Clangd-Instanz @@ -53709,7 +53709,7 @@ Gibt an, wie sich die Rücktaste bezüglich Einrückung verhält. Rechtsbündig - Line annotations + Line Annotations Zeilenannotationen @@ -54643,7 +54643,7 @@ Drücken Sie zusätzlich die Umschalttaste, wird ein Escape-Zeichen an der aktue Zeichenketten automatisch teilen - &Automatically insert matching characters + &Automatically Insert Matching Characters &Passende Zeichen automatisch einfügen @@ -55682,7 +55682,7 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten. Zurücksetzen - Scanning scope + Scanning Scope Suchbereich diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 551e7a53576..98aab98285b 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -10730,7 +10730,7 @@ dans le navigateur système pour un téléchargement manuel. Liste des NDK Android : - Android OpenSSL settings (Optional) + Android OpenSSL Settings (Optional) Paramètres Android d'OpenSSL (optionnel) @@ -12712,7 +12712,7 @@ Exécutable : %2 Répétition des tests - Run in parallel + Run in Parallel Exécuter en parallèle @@ -22228,7 +22228,7 @@ Le modèle de code intégré gèrera le surlignage, la complétion, etc.Seuil de mise à jour du document : - Sessions with a single clangd instance + Sessions with a Single Clangd Instance Sessions avec une seule instance de clangd @@ -22982,8 +22982,8 @@ p.ex. nom = « m_test_toto_ » : Modèles de getters et setters personnalisés - Value types: - Types de valeur : + Value Types + Types de valeur Projects only @@ -52717,7 +52717,7 @@ si le commentaire débute avec « /*! » ou « //! ».À la demande - &Automatically insert matching characters + &Automatically Insert Matching Characters Insérer &automatiquement les caractères correspondants @@ -54974,7 +54974,7 @@ francis : en effet, une erreur de ma part --> validé. Entre les lignes - Line annotations + Line Annotations Annotations de ligne @@ -55417,7 +55417,7 @@ Influence l’indentation des lignes de continuation. Scanner le sous-projet actuel - Scanning scope + Scanning Scope Portée de la recherche diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index ad756fc8eff..1ac507c4f33 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -8025,7 +8025,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and Automatski rastavi znakovne nizove - &Automatically insert matching characters + &Automatically Insert Matching Characters &Automatski umetni poklapajuće znakove @@ -8193,7 +8193,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and Označi promjene u &tekstu - Line annotations + Line Annotations Napomene za retke @@ -8443,7 +8443,7 @@ Utječe na uvlačenje neprekinutih redaka. Resetiraj - Scanning scope + Scanning Scope Raspon pretrage diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 7749cdd5b85..ad48c4e5386 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -785,7 +785,7 @@ SDK のセットアップ - Android OpenSSL settings (Optional) + Android OpenSSL Settings (Optional) Android OpenSSL の設定 (オプション) @@ -1895,7 +1895,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and 文字列を自動的に分割する - &Automatically insert matching characters + &Automatically Insert Matching Characters マッチング文字を自動的に挿入する(&A) @@ -6322,7 +6322,7 @@ Backspace キーが押された時のインデントの動作を指定します ファイル内のナビゲーションをアニメーション化する - Line annotations + Line Annotations ラインアノテーション @@ -6678,7 +6678,7 @@ Influences the indentation of continuation lines. リセット - Scanning scope + Scanning Scope スキャンする範囲 diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 8f03341d594..d976700365c 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -9917,7 +9917,7 @@ in the system's browser for manual download. Lista Android NDK: - Android OpenSSL settings (Optional) + Android OpenSSL Settings (Optional) Ustawienia Android OpenSSL (opcjonalne) @@ -12496,7 +12496,7 @@ See also Google Test settings. Powtarzanie testów - Run in parallel + Run in Parallel Uruchomianie równoległe @@ -15958,8 +15958,8 @@ tylko przez wbudowane narzędzie. Użyj globalnych ustawień - ClangFormat settings: - Ustawienia ClangFormat: + ClangFormat Settings + Ustawienia ClangFormat Indenting only @@ -21384,7 +21384,7 @@ The built-in code model will handle highlighting, completion and so on. Próg uaktualniania dokumentu: - Sessions with a single clangd instance + Sessions with a Single Clangd Instance Sesje z pojedynczą instancją clangd @@ -22069,8 +22069,8 @@ e.g. name = "m_test_foo_": Własne szablony pobieraczy i ustawiaczy - Value types: - Typy wartości: + Value Types + Typy wartości Projects only @@ -52771,7 +52771,7 @@ Ustala, jak klawisz "Backspace" reaguje na wcięcia. Pomiędzy liniami - Line annotations + Line Annotations Adnotacje linii @@ -53749,7 +53749,7 @@ po naciśnięciu klawisza Enter - &Automatically insert matching characters + &Automatically Insert Matching Characters &Automatyczne wstawianie znaków @@ -54144,7 +54144,7 @@ if the comment starts with "/*!" or "//!". Zresetuj - Scanning scope + Scanning Scope Zakres skanowania diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 36f35ad2d3d..944bb021419 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -2169,7 +2169,7 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen(). Настроить SDK - Android OpenSSL settings (Optional) + Android OpenSSL Settings (Optional) Настройки Android OpenSSL (опционально) @@ -43125,7 +43125,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and Автоматически разделять строки - &Automatically insert matching characters + &Automatically Insert Matching Characters &Автоматически вставлять парные символы @@ -43309,7 +43309,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and Прижать к правому краю - Line annotations + Line Annotations Построчная аннотация @@ -45131,7 +45131,7 @@ The trace data is lost. Сбросить - Scanning scope + Scanning Scope Область поиска diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index bf9deb0e7ff..808afd64880 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -3153,7 +3153,7 @@ to version control (%2) Автоматично вставляти крапки з комами, закриваючі квадратні, круглі, фігурні дужки та лапки, коли необхідно. - &Automatically insert matching characters + &Automatically Insert Matching Characters &Автоматично вставляти парні символи @@ -21894,7 +21894,7 @@ Influences the indentation of continuation lines. Скинути - Scanning scope + Scanning Scope Область пошуку diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 31f811171cf..cc7609ab504 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -1900,7 +1900,7 @@ in the system's browser for manual download. 安卓 NDK 列表： - Android OpenSSL settings (Optional) + Android OpenSSL Settings (Optional) 安卓 OpenSSL 设置（可选） @@ -2714,7 +2714,7 @@ Executable: %2 重复测试 - Run in parallel + Run in Parallel 并行运行 @@ -11600,7 +11600,7 @@ The built-in code model will handle highlighting, completion and so on. - Sessions with a single clangd instance + Sessions with a Single Clangd Instance @@ -12767,7 +12767,7 @@ Flags: %3 - Value types: + Value Types: @@ -42591,7 +42591,7 @@ Specifies how backspace interacts with indentation. - Line annotations + Line Annotations @@ -42978,7 +42978,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and - &Automatically insert matching characters + &Automatically Insert Matching Characters @@ -44774,7 +44774,7 @@ Will not be applied to whitespace in comments and strings. 重置 - Scanning scope + Scanning Scope 扫描范围 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index d21d4d9bca2..7b5f5cfba84 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -1715,7 +1715,7 @@ 在適當的時候自動插入分號、結束的括號、大括號與引號等等。 - &Automatically insert matching characters + &Automatically Insert Matching Characters 自動插入對應的字元(&A) @@ -25376,7 +25376,7 @@ Influences the indentation of continuation lines. 重置 - Scanning scope + Scanning Scope 掃描範圍 diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index de44a3f1cf5..8f1f40ffe07 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -435,7 +435,7 @@ AndroidSettingsWidget::AndroidSettingsWidget() } }, Group { - title(Tr::tr("Android OpenSSL settings (Optional)")), + title(Tr::tr("Android OpenSSL Settings (Optional)")), Grid { Tr::tr("OpenSSL binaries location:"), m_openSslPathChooser, diff --git a/src/plugins/autotest/ctest/ctesttool.cpp b/src/plugins/autotest/ctest/ctesttool.cpp index 8b82953e2c4..d60363663f5 100644 --- a/src/plugins/autotest/ctest/ctesttool.cpp +++ b/src/plugins/autotest/ctest/ctesttool.cpp @@ -34,6 +34,7 @@ CTestTool::CTestTool() setId("AutoTest.Framework.CTest"); setDisplayName(Tr::tr("CTest")); + // clang-format off setLayouter([this] { return Row { Form { outputOnFail, br, @@ -41,12 +42,12 @@ CTestTool::CTestTool() stopOnFailure, br, outputMode, br, Group { - title(Tr::tr("Repeat tests")), + title(Tr::tr("Repeat Tests")), repeat.groupChecker(), Row { repetitionMode, repetitionCount}, }, br, Group { - title(Tr::tr("Run in parallel")), + title(Tr::tr("Run in Parallel")), parallel.groupChecker(), Column { Row { jobs }, br, @@ -55,6 +56,7 @@ CTestTool::CTestTool() } }, st }; }); + // clang-format on outputOnFail.setSettingsKey("OutputOnFail"); outputOnFail.setLabelText(Tr::tr("Output on failure")); diff --git a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp index 4dc344601d7..65017b92ad5 100644 --- a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp +++ b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp @@ -106,9 +106,10 @@ ClangFormatGlobalConfigWidget::ClangFormatGlobalConfigWidget(ICodeStylePreferenc QWidget *globalSettingsGroupBoxWidget = nullptr; + // clang-format off Group globalSettingsGroupBox { bindTo(&globalSettingsGroupBoxWidget), - title(Tr::tr("ClangFormat settings:")), + title(Tr::tr("ClangFormat Settings:")), Column { m_useGlobalSettings, Form { @@ -127,6 +128,7 @@ ClangFormatGlobalConfigWidget::ClangFormatGlobalConfigWidget(ICodeStylePreferenc globalSettingsGroupBox, noMargin }.attachTo(this); + // clang-format on initCheckBoxes(); initIndentationOrFormattingCombobox(); diff --git a/src/plugins/cppeditor/clangdsettings.cpp b/src/plugins/cppeditor/clangdsettings.cpp index fe3bc84b23b..daa78aad7eb 100644 --- a/src/plugins/cppeditor/clangdsettings.cpp +++ b/src/plugins/cppeditor/clangdsettings.cpp @@ -770,7 +770,7 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD if (!isForProject) { m_sessionsModel.setStringList(settingsData.sessionsWithOneClangd); m_sessionsModel.sort(0); - m_sessionsGroupBox = new QGroupBox(Tr::tr("Sessions with a single clangd instance")); + m_sessionsGroupBox = new QGroupBox(Tr::tr("Sessions with a Single Clangd Instance")); const auto sessionsView = new Utils::ListView; sessionsView->setModel(&m_sessionsModel); sessionsView->setToolTip( diff --git a/src/plugins/cppeditor/cppcodestylesettingspage.cpp b/src/plugins/cppeditor/cppcodestylesettingspage.cpp index edcca95a349..2364dee8145 100644 --- a/src/plugins/cppeditor/cppcodestylesettingspage.cpp +++ b/src/plugins/cppeditor/cppcodestylesettingspage.cpp @@ -246,10 +246,12 @@ public: m_statementMacros->setToolTip( Tr::tr("Macros that can be used as statements without a trailing semicolon.")); m_statementMacros->setSizePolicy(sizePolicy); + // clang-format off const Group statementMacrosGroup { - title(Tr::tr("Statement macros")), + title(Tr::tr("Statement Macros")), Column { m_statementMacros} }; + // clang-format on QObject::connect(m_statementMacros, &QPlainTextEdit::textChanged, q, [this] { m_handlingStatementMacroChange = true; q->slotCodeStyleSettingsChanged(); diff --git a/src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.cpp index 9445ed3c54e..67213105bc4 100644 --- a/src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.cpp +++ b/src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.cpp @@ -215,6 +215,7 @@ e.g. name = "m_test_foo_": using namespace Layouting; + // clang-format off Grid { empty, ulLabel(Tr::tr("Generate Setters")), ulLabel(Tr::tr("Generate Getters")), br, Tr::tr("Inside class:"), Tr::tr("Default"), Tr::tr("Default"), br, @@ -274,7 +275,7 @@ e.g. name = "m_test_foo_": }, }, Group { - title(Tr::tr("Value types:")), + title(Tr::tr("Value Types")), Row { m_valueTypes, Column { pushButton_addValueType, pushButton_removeValueType, st, }, @@ -282,6 +283,7 @@ e.g. name = "m_test_foo_": }, m_returnByConstRefCheckBox, }.attachTo(this); + // clang-format on // connect controls to settingsChanged signal auto then = [this] { diff --git a/src/plugins/texteditor/completionsettingspage.cpp b/src/plugins/texteditor/completionsettingspage.cpp index aba86467143..03f45404c6b 100644 --- a/src/plugins/texteditor/completionsettingspage.cpp +++ b/src/plugins/texteditor/completionsettingspage.cpp @@ -214,7 +214,7 @@ CompletionSettingsPageWidget::CompletionSettingsPageWidget(CompletionSettingsPag } }, Group { - title(Tr::tr("&Automatically insert matching characters")), + title(Tr::tr("&Automatically Insert Matching Characters")), Row { Column { m_insertBrackets, diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp index b5435ed5e91..fe914b27ce9 100644 --- a/src/plugins/texteditor/displaysettingspage.cpp +++ b/src/plugins/texteditor/displaysettingspage.cpp @@ -108,7 +108,7 @@ public: rightAligned->setChecked(true); betweenLines = new QRadioButton(Tr::tr("Between lines")); - displayAnnotations = new QGroupBox(Tr::tr("Line annotations")), + displayAnnotations = new QGroupBox(Tr::tr("Line Annotations")), displayAnnotations->setCheckable(true); using namespace Layouting; diff --git a/src/plugins/todo/settings.cpp b/src/plugins/todo/settings.cpp index 68f6a3d7092..71c2a1b69e9 100644 --- a/src/plugins/todo/settings.cpp +++ b/src/plugins/todo/settings.cpp @@ -212,7 +212,7 @@ OptionsDialog::OptionsDialog() } }, Group { - title(Tr::tr("Scanning scope")), + title(Tr::tr("Scanning Scope")), Column { m_scanInProjectRadioButton, m_scanInCurrentFileRadioButton,