diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 74aa7064eb4..f3e863b7c3c 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -42723,11 +42723,7 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. - RangeDetails - - Duration - Doba trvání - + Tracing Details Podrobnosti @@ -46209,7 +46205,7 @@ Tyto předpony se používají dodatečně k nynějšímu názvu souboru na Pře - SelectionRangeDetails + Tracing Selection Výběr diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 0695a8071ff..fd66da8720f 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -4296,7 +4296,7 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15. - ButtonsBar + Tracing Jump to previous event. Hop to forrige event. @@ -5193,7 +5193,7 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15. - CategoryLabel + Tracing Collapse category Sammenfold kategori @@ -35793,7 +35793,7 @@ Derudover testes enhedens forbindelse. - RowLabel + Tracing [unknown] [ukendt] @@ -36522,7 +36522,7 @@ Række: %4, Kolonne: %5 - SelectionRangeDetails + Tracing Selection Markering @@ -43466,7 +43466,7 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o - FlameGraphView + Tracing others andre @@ -43765,7 +43765,7 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o - Timeline::TimelineTraceManager + Tracing Could not open %1 for writing. Kunne ikke åbne %1 til skrivning. diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 497839143ac..f3d22974f8d 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -17481,7 +17481,7 @@ Diese Präfixe werden zusätzlich zum Dateinamen beim Wechseln zwischen Header- - SelectionRangeDetails + Tracing Selection Auswahl @@ -27109,7 +27109,7 @@ Möchten Sie es beenden? - ButtonsBar + Tracing Jump to previous event. Gehe zu vorangehendem Ereignis. @@ -27130,9 +27130,6 @@ Möchten Sie es beenden? View event information on mouseover. Information zu Ereignis anzeigen, wenn sich der Mauszeiger darüber befindet. - - - CategoryLabel Collapse category Kategorie einklappen @@ -31344,7 +31341,7 @@ konnte dem Projekt "%2" nicht hinzugefügt werden. - RowLabel + Tracing [unknown] [unbekannt] @@ -41336,7 +41333,7 @@ Breche ausstehende Operationen ab... - FlameGraphView + Tracing others andere @@ -41487,7 +41484,7 @@ Breche ausstehende Operationen ab... - Timeline::TimelineTraceManager + Tracing Could not open %1 for writing. Die Datei %1 konnte nicht zum Schreiben geöffnet werden. @@ -44848,19 +44845,11 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - RangeDetails + Tracing Edit note Notiz bearbeiten - - View event information on mouseover. - Information zu Ereignis anzeigen, wenn sich der Mauszeiger darüber befindet. - - - Close - Schließen - BoostSettingsPage diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 89692ac498b..0e64d081dc1 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -43079,11 +43079,7 @@ Pour compiler l'observateur QML, allez à la page des versions de Qt, séle - RangeDetails - - Duration - Durée - + Tracing Details Détails @@ -45121,7 +45117,7 @@ Ces chemines sont utilisés en complément au répertoire courant pour basculer - SelectionRangeDetails + Tracing Selection Sélection diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index d781e55a778..a6c22c8b34b 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -388,7 +388,7 @@ - ButtonsBar + Tracing Jump to previous event. Prijeđi na prethodni događaj. @@ -409,9 +409,6 @@ View event information on mouseover. Prikaži podatke događaja kad se miš nalazi iznad. - - - CategoryLabel Collapse category Sklopi kategoriju @@ -420,9 +417,6 @@ Expand category Rasklopi kategoriju - - - FlameGraphView others ostali @@ -439,16 +433,10 @@ Visualize %1 Vizualiziraj %1 - - - RowLabel [unknown] [nepoznato] - - - SelectionRangeDetails Selection Odabir @@ -12989,7 +12977,7 @@ For more information, see the "Checking Code Syntax" documentation. - Timeline::TimelineTraceManager + Tracing Could not open %1 for writing. diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 4f8219b670d..bbb6d238135 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -5953,7 +5953,7 @@ Add, modify, and remove document filters, which determine the documentation set - SelectionRangeDetails + Tracing Selection 選択部分 @@ -35796,7 +35796,7 @@ kill しますか？ - ButtonsBar + Tracing Jump to previous event. 前のイベントにジャンプします。 @@ -36734,7 +36734,7 @@ API バージョンが %1 以上の SDK をインストールしてください - CategoryLabel + Tracing Collapse category カテゴリを折りたたむ @@ -36743,9 +36743,6 @@ API バージョンが %1 以上の SDK をインストールしてください Expand category カテゴリを展開する - - - RowLabel [unknown] [不明] @@ -37591,7 +37588,7 @@ the program. - FlameGraphView + Tracing Details 詳細 @@ -47887,15 +47884,7 @@ Output: - RangeDetails - - View event information on mouseover. - マウスオーバー時にイベント情報を表示します。 - - - Close - 閉じる - + Tracing PerfProfilerFlameGraphView @@ -48370,7 +48359,7 @@ Output: - Timeline::TimelineTraceManager + Tracing Could not open %1 for writing. 書き込み用に %1 を開けません。 diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 8225bbfa50f..2aaee2fc266 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -20030,7 +20030,7 @@ Przedrostki te, w dodatku do nazwy bieżącego pliku, używane są do przełącz - SelectionRangeDetails + Tracing Selection Selekcja @@ -30188,7 +30188,7 @@ Instalowanie lokalnych bibliotek Qt nie jest kompatybilne z Androidem 5. - ButtonsBar + Tracing Jump to previous event. Skocz do poprzedniego zdarzenia. @@ -30209,9 +30209,6 @@ Instalowanie lokalnych bibliotek Qt nie jest kompatybilne z Androidem 5.View event information on mouseover. Pokazuj informacje o zdarzeniach po najechaniu myszą. - - - CategoryLabel Collapse category Zwiń kategorię @@ -34008,7 +34005,7 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan - RowLabel + Tracing [unknown] [nieznany] diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index aa520f69199..62f34fb563c 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -6046,7 +6046,7 @@ For example, "Revision: 15" will leave the branch at revision 15. - ButtonsBar + Tracing Jump to previous event. Перейти к предыдущему событию. @@ -7086,7 +7086,7 @@ For example, "Revision: 15" will leave the branch at revision 15. - CategoryLabel + Tracing Collapse category Категория сворачивания @@ -20575,7 +20575,7 @@ will also disable the following plugins: - FlameGraphView + Tracing others другие @@ -44696,15 +44696,11 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - RangeDetails + Tracing Edit note Изменить заметку - - View event information on mouseover. - Показывать информацию о событии при наведении курсора. - Close Закрыть @@ -45785,7 +45781,7 @@ If you do not have a private key yet, you can also create one here. - RowLabel + Tracing [unknown] [неизвестная] @@ -46550,7 +46546,7 @@ Row: %4, Column: %5 - SelectionRangeDetails + Tracing Selection Выделение @@ -46567,10 +46563,6 @@ Row: %4, Column: %5 Duration Продолжительность - - Close - Закрыть - SerialTerminal::Internal::SerialControl @@ -50319,7 +50311,7 @@ Will not be applied to whitespace in comments and strings. - Timeline::TimelineTraceManager + Tracing Could not open %1 for writing. Не удалось открыть %1 для записи. diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 3dd0a171914..087019b2257 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -20805,7 +20805,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - RangeDetails + Tracing Duration: Тривалість: @@ -25898,7 +25898,7 @@ These prefixes are used in addition to current file name on Switch Header/Source - SelectionRangeDetails + Tracing Selection Виділення @@ -43065,7 +43065,7 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d - ButtonsBar + Tracing Jump to previous event. Перейти до попередньої події. @@ -43086,9 +43086,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d View event information on mouseover. - - - CategoryLabel <bytecode> <байт-код> @@ -48242,7 +48239,7 @@ Affected are breakpoints %1 - RowLabel + Tracing [unknown] [невідомий] @@ -52157,7 +52154,7 @@ the program. - FlameGraphView + Tracing Details Деталі diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index a19b741b931..3e281d9cb94 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -40634,7 +40634,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi - RangeDetails + Tracing Duration 持续时间 @@ -43393,7 +43393,7 @@ p, li { white-space: pre-wrap; } - SelectionRangeDetails + Tracing Selection 选择 @@ -43402,10 +43402,6 @@ p, li { white-space: pre-wrap; } Start 启动 - - Duration - 持续时间 - Qnx diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 8884be2f76c..48437bf84c6 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -25330,7 +25330,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi - RangeDetails + Tracing Duration: 持續時間： @@ -27260,7 +27260,7 @@ p, li { white-space: pre-wrap; } - SelectionRangeDetails + Tracing Selection 選擇 diff --git a/src/libs/tracing/qml/ButtonsBar.qml b/src/libs/tracing/qml/ButtonsBar.qml index 8fd520505ec..a8dd5aaf084 100644 --- a/src/libs/tracing/qml/ButtonsBar.qml +++ b/src/libs/tracing/qml/ButtonsBar.qml @@ -47,7 +47,7 @@ ToolBar { Layout.fillHeight: true imageSource: "image://icons/prev" - ToolTip.text: qsTr("Jump to previous event.") + ToolTip.text: qsTranslate("Tracing", "Jump to previous event.") onClicked: buttons.jumpToPrev() } @@ -56,7 +56,7 @@ ToolBar { Layout.fillHeight: true imageSource: "image://icons/next" - ToolTip.text: qsTr("Jump to next event.") + ToolTip.text: qsTranslate("Tracing", "Jump to next event.") onClicked: buttons.jumpToNext() } @@ -65,7 +65,7 @@ ToolBar { Layout.fillHeight: true imageSource: "image://icons/zoom" - ToolTip.text: qsTr("Show zoom slider.") + ToolTip.text: qsTranslate("Tracing", "Show zoom slider.") checkable: true checked: false onCheckedChanged: buttons.zoomControlChanged() @@ -76,7 +76,7 @@ ToolBar { Layout.fillHeight: true imageSource: "image://icons/" + (checked ? "rangeselected" : "rangeselection"); - ToolTip.text: qsTr("Select range.") + ToolTip.text: qsTranslate("Tracing", "Select range.") checkable: true checked: false onCheckedChanged: buttons.rangeSelectChanged() @@ -87,7 +87,7 @@ ToolBar { Layout.fillHeight: true imageSource: "image://icons/selectionmode" - ToolTip.text: qsTr("View event information on mouseover.") + ToolTip.text: qsTranslate("Tracing", "View event information on mouseover.") checkable: true checked: false onCheckedChanged: buttons.lockChanged() diff --git a/src/libs/tracing/qml/CategoryLabel.qml b/src/libs/tracing/qml/CategoryLabel.qml index 16cf63fb392..88dc5e89f46 100644 --- a/src/libs/tracing/qml/CategoryLabel.qml +++ b/src/libs/tracing/qml/CategoryLabel.qml @@ -163,7 +163,8 @@ Item { implicitHeight: txt.height - 1 enabled: expanded || (model && !model.empty) imageSource: expanded ? "image://icons/close_split" : "image://icons/split" - ToolTip.text: expanded ? qsTr("Collapse category") : qsTr("Expand category") + ToolTip.text: expanded ? qsTranslate("Tracing", "Collapse category") + : qsTranslate("Tracing", "Expand category") onClicked: model.expanded = !expanded } diff --git a/src/libs/tracing/qml/FlameGraphView.qml b/src/libs/tracing/qml/FlameGraphView.qml index a670a079219..1a203f77ecf 100644 --- a/src/libs/tracing/qml/FlameGraphView.qml +++ b/src/libs/tracing/qml/FlameGraphView.qml @@ -41,7 +41,7 @@ ScrollView { property var details: function(flameGraph) { return []; } property var summary: function(attached) { if (!attached.dataValid) - return qsTr("others"); + return qsTranslate("Tracing", "others"); return attached.data(summaryRole) + " (" + percent(sizeRole, attached) + "%)"; } @@ -230,7 +230,8 @@ ScrollView { // Functions, not properties to limit the initial overhead when creating the nodes, // and because FlameGraph.data(...) cannot be notified anyway. function title() { - return FlameGraph.data(root.detailsTitleRole) || qsTr("unknown"); + return FlameGraph.data(root.detailsTitleRole) + || qsTranslate("Tracing", "unknown"); } function note() { @@ -275,7 +276,7 @@ ScrollView { if (currentNode) return currentNode.title(); else if (root.model === null || root.model.rowCount() === 0) - return qsTr("No data available"); + return qsTranslate("Tracing", "No data available"); else return ""; } diff --git a/src/libs/tracing/qml/RangeDetails.qml b/src/libs/tracing/qml/RangeDetails.qml index c4c99c44873..14d6aa9e7af 100644 --- a/src/libs/tracing/qml/RangeDetails.qml +++ b/src/libs/tracing/qml/RangeDetails.qml @@ -88,7 +88,7 @@ Item { implicitHeight: typeTitle.height visible: !rangeDetails.noteReadonly onClicked: noteEdit.focus = true - ToolTip.text: qsTr("Edit note") + ToolTip.text: qsTranslate("Tracing", "Edit note") } ImageToolButton { @@ -98,7 +98,7 @@ Item { anchors.right: closeIcon.left implicitHeight: typeTitle.height onClicked: locked = !locked - ToolTip.text: qsTr("View event information on mouseover.") + ToolTip.text: qsTranslate("Tracing", "View event information on mouseover.") } ImageToolButton { @@ -108,7 +108,7 @@ Item { implicitHeight: typeTitle.height imageSource: "image://icons/close_window" onClicked: rangeDetails.clearSelection() - ToolTip.text: qsTr("Close") + ToolTip.text: qsTranslate("Tracing", "Close") } } diff --git a/src/libs/tracing/qml/RowLabel.qml b/src/libs/tracing/qml/RowLabel.qml index 53ca5c6eaf2..37cab676619 100644 --- a/src/libs/tracing/qml/RowLabel.qml +++ b/src/libs/tracing/qml/RowLabel.qml @@ -14,7 +14,8 @@ Button { signal selectBySelectionId() signal setRowHeight(int newHeight) - property string labelText: label.description ? label.description : qsTr("[unknown]") + property string labelText: label.description ? label.description + : qsTranslate("Tracing", "[unknown]") onPressed: selectBySelectionId(); ToolTip.text: labelText + (label.displayName ? (" (" + label.displayName + ")") : "") diff --git a/src/libs/tracing/qml/SelectionRangeDetails.qml b/src/libs/tracing/qml/SelectionRangeDetails.qml index c77c901c16f..e837135121b 100644 --- a/src/libs/tracing/qml/SelectionRangeDetails.qml +++ b/src/libs/tracing/qml/SelectionRangeDetails.qml @@ -54,7 +54,7 @@ Item { //title TimelineText { id: typeTitle - text: " "+qsTr("Selection") + text: " "+qsTranslate("Tracing", "Selection") font.bold: true height: 20 verticalAlignment: Text.AlignVCenter @@ -78,11 +78,11 @@ Item { Repeater { id: details property var contents: [ - qsTr("Start") + ":", + qsTranslate("Tracing", "Start") + ":", TimeFormatter.format(startTime, referenceDuration), - (qsTr("End") + ":"), + (qsTranslate("Tracing", "End") + ":"), TimeFormatter.format(endTime, referenceDuration), - (qsTr("Duration") + ":"), + (qsTranslate("Tracing", "Duration") + ":"), TimeFormatter.format(duration, referenceDuration) ] @@ -112,6 +112,6 @@ Item { anchors.top: selectionRangeDetails.top implicitHeight: typeTitle.height onClicked: selectionRangeDetails.close() - ToolTip.text: qsTr("Close") + ToolTip.text: qsTranslate("Tracing", "Close") } } diff --git a/src/libs/tracing/timelinetracemanager.cpp b/src/libs/tracing/timelinetracemanager.cpp index 2c0b45849be..293bcf3c9ae 100644 --- a/src/libs/tracing/timelinetracemanager.cpp +++ b/src/libs/tracing/timelinetracemanager.cpp @@ -2,8 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "timelinenotesmodel.h" -#include "timelinetracemanager.h" #include "timelinetracefile.h" +#include "timelinetracemanager.h" +#include "tracingtr.h" #include #include @@ -229,7 +230,7 @@ QFuture TimelineTraceManager::save(const QString &filename) if (file.open(QIODevice::WriteOnly)) writer->save(&file); else - writer->fail(tr("Could not open %1 for writing.").arg(filename)); + writer->fail(Tr::tr("Could not open %1 for writing.").arg(filename)); if (future.isCanceled()) file.remove(); @@ -255,7 +256,7 @@ QFuture TimelineTraceManager::load(const QString &filename) if (file.open(QIODevice::ReadOnly)) reader->load(&file); else - reader->fail(tr("Could not open %1 for reading.").arg(filename)); + reader->fail(Tr::tr("Could not open %1 for reading.").arg(filename)); reader->deleteLater(); }); @@ -374,8 +375,8 @@ void TimelineTraceManager::restrictByFilter(TraceEventFilter filter) finalize(); }, [this](const QString &message) { if (!message.isEmpty()) { - emit error(tr("Could not re-read events from temporary trace file: %1\n" - "The trace data is lost.").arg(message)); + emit error(Tr::tr("Could not re-read events from temporary trace file: %1\n" + "The trace data is lost.").arg(message)); } clearAll(); }, future); diff --git a/src/libs/tracing/tracingtr.h b/src/libs/tracing/tracingtr.h index 12da89810e7..05e4bd6a537 100644 --- a/src/libs/tracing/tracingtr.h +++ b/src/libs/tracing/tracingtr.h @@ -5,7 +5,7 @@ #include -namespace Tracing { +namespace Timeline { struct Tr {