From 638874edfbea299d7c9eeb742a41b96788cf5aa4 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 13 Dec 2024 12:25:47 +0100 Subject: [PATCH] Disambiguate translations for "All" Translations can be different depending on context. Give each usage a disambiguation text. Task-number: QTCREATORBUG-31978 Change-Id: I5fe854f96ce285943ff47993cd6d56db603d1c27 Reviewed-by: Christian Stenger --- src/libs/extensionsystem/plugindetailsview.cpp | 2 +- src/plugins/android/androidsdkmanagerdialog.cpp | 2 +- src/plugins/autotest/projectsettingswidget.cpp | 2 +- src/plugins/autotest/testsettings.cpp | 2 +- src/plugins/cppeditor/symbolsfindfilter.cpp | 8 +++++--- src/plugins/extensionmanager/extensionsbrowser.cpp | 6 ++---- src/plugins/git/gitclient.cpp | 8 ++++---- src/plugins/projectexplorer/projectexplorersettings.cpp | 2 +- src/plugins/qmlprofiler/quick3dframemodel.cpp | 4 ++-- src/plugins/qmlprofiler/quick3dframeview.cpp | 6 +++--- src/plugins/qtsupport/qtoptionspage.cpp | 3 ++- 11 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/libs/extensionsystem/plugindetailsview.cpp b/src/libs/extensionsystem/plugindetailsview.cpp index 903e7410ac1..9dff8f58985 100644 --- a/src/libs/extensionsystem/plugindetailsview.cpp +++ b/src/libs/extensionsystem/plugindetailsview.cpp @@ -164,7 +164,7 @@ void PluginDetailsView::update(PluginSpec *spec) d->documentationUrl->setText(toHtmlLink(spec->documentationUrl())); d->location->setText(spec->filePath().toUserOutput()); const QString pattern = spec->platformSpecification().pattern(); - const QString platform = pattern.isEmpty() ? Tr::tr("All") : pattern; + const QString platform = pattern.isEmpty() ? Tr::tr("All", "Platforms: All") : pattern; const QString platformString = Tr::tr("%1 (current: \"%2\")") .arg(platform, PluginManager::platformName()); d->platforms->setText(platformString); diff --git a/src/plugins/android/androidsdkmanagerdialog.cpp b/src/plugins/android/androidsdkmanagerdialog.cpp index 4de5df631bf..679dc2376d0 100644 --- a/src/plugins/android/androidsdkmanagerdialog.cpp +++ b/src/plugins/android/androidsdkmanagerdialog.cpp @@ -439,7 +439,7 @@ AndroidSdkManagerDialog::AndroidSdkManagerDialog() auto showAvailableRadio = new QRadioButton(Tr::tr("Available")); auto showInstalledRadio = new QRadioButton(Tr::tr("Installed")); - auto showAllRadio = new QRadioButton(Tr::tr("All")); + auto showAllRadio = new QRadioButton(Tr::tr("All", "Show all packages")); showAllRadio->setChecked(true); auto optionsButton = new QPushButton(Tr::tr("Advanced Options...")); diff --git a/src/plugins/autotest/projectsettingswidget.cpp b/src/plugins/autotest/projectsettingswidget.cpp index 9a14b40345d..eb450dbbd3b 100644 --- a/src/plugins/autotest/projectsettingswidget.cpp +++ b/src/plugins/autotest/projectsettingswidget.cpp @@ -62,7 +62,7 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(Project *project) m_activeFrameworks->setRootIsDecorated(false); m_runAfterBuild = new QComboBox; m_runAfterBuild->addItem(Tr::tr("No Tests")); - m_runAfterBuild->addItem(Tr::tr("All")); + m_runAfterBuild->addItem(Tr::tr("All", "Run tests after build")); m_runAfterBuild->addItem(Tr::tr("Selected")); m_runAfterBuild->setCurrentIndex(int(m_projectSettings->runAfterBuild())); m_applyFilter.setToolTip(Tr::tr("Apply path filters before scanning for tests.")); diff --git a/src/plugins/autotest/testsettings.cpp b/src/plugins/autotest/testsettings.cpp index af1767e4283..84edff3102d 100644 --- a/src/plugins/autotest/testsettings.cpp +++ b/src/plugins/autotest/testsettings.cpp @@ -107,7 +107,7 @@ TestSettings::TestSettings() runAfterBuild.setDisplayStyle(Utils::SelectionAspect::DisplayStyle::ComboBox); runAfterBuild.setToolTip(Tr::tr("Runs chosen tests automatically if a build succeeded.")); runAfterBuild.addOption(Tr::tr("No Tests")); - runAfterBuild.addOption(Tr::tr("All")); + runAfterBuild.addOption(Tr::tr("All", "Run tests after build")); runAfterBuild.addOption(Tr::tr("Selected")); fromSettings(); diff --git a/src/plugins/cppeditor/symbolsfindfilter.cpp b/src/plugins/cppeditor/symbolsfindfilter.cpp index 5d7c2e57aa3..68d68b50bb2 100644 --- a/src/plugins/cppeditor/symbolsfindfilter.cpp +++ b/src/plugins/cppeditor/symbolsfindfilter.cpp @@ -223,9 +223,11 @@ QString SymbolsFindFilter::toolTip(FindFlags findFlags) const if (m_symbolsToSearch & SymbolSearcher::Declarations) types.append(Tr::tr("Declarations")); return Tr::tr("Scope: %1\nTypes: %2\nFlags: %3") - .arg(searchScope() == SymbolSearcher::SearchGlobal ? Tr::tr("All") : Tr::tr("Projects"), - types.join(", "), - IFindFilter::descriptionForFindFlags(findFlags)); + .arg( + searchScope() == SymbolSearcher::SearchGlobal ? Tr::tr("All", "Symbol search scope") + : Tr::tr("Projects"), + types.join(", "), + IFindFilter::descriptionForFindFlags(findFlags)); } // #pragma mark -- SymbolsFindFilterConfigWidget diff --git a/src/plugins/extensionmanager/extensionsbrowser.cpp b/src/plugins/extensionmanager/extensionsbrowser.cpp index 420bb0344fb..ed04d938ed2 100644 --- a/src/plugins/extensionmanager/extensionsbrowser.cpp +++ b/src/plugins/extensionmanager/extensionsbrowser.cpp @@ -448,10 +448,8 @@ public: { static const QList options = { { - Tr::tr("All"), - []([[maybe_unused]] const QModelIndex &index) { - return true; - }, + Tr::tr("All", "Extensions filter"), + []([[maybe_unused]] const QModelIndex &index) { return true; }, }, { Tr::tr("Extension packs"), diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 811a754cc7d..ca1a65fb9ae 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -647,10 +647,10 @@ public: GitLogConfig(bool fileRelated, GitEditorWidget *editor) : GitBaseConfig(editor) { - QAction *allBranchesButton = - addToggleButton(QStringList{"--all"}, - Tr::tr("All"), - Tr::tr("Show log for all local branches.")); + QAction *allBranchesButton = addToggleButton( + QStringList{"--all"}, + Tr::tr("All", "All branches"), + Tr::tr("Show log for all local branches.")); mapSetting(allBranchesButton, &settings().allBranches); QAction *firstParentButton = addToggleButton({"-m", "--first-parent"}, diff --git a/src/plugins/projectexplorer/projectexplorersettings.cpp b/src/plugins/projectexplorer/projectexplorersettings.cpp index de18ec30002..1ffffec2b7a 100644 --- a/src/plugins/projectexplorer/projectexplorersettings.cpp +++ b/src/plugins/projectexplorer/projectexplorersettings.cpp @@ -348,7 +348,7 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget() m_stopBeforeBuildComboBox = new QComboBox; m_stopBeforeBuildComboBox->addItem( Tr::tr("None", "Stop applications before building: None"), int(StopBeforeBuild::None)); - m_stopBeforeBuildComboBox->addItem(Tr::tr("All"), int(StopBeforeBuild::All)); + m_stopBeforeBuildComboBox->addItem(Tr::tr("All", "Stop all projects"), int(StopBeforeBuild::All)); m_stopBeforeBuildComboBox->addItem(Tr::tr("Same Project"), int(StopBeforeBuild::SameProject)); m_stopBeforeBuildComboBox->addItem(Tr::tr("Same Build Directory"), int(StopBeforeBuild::SameBuildDir)); diff --git a/src/plugins/qmlprofiler/quick3dframemodel.cpp b/src/plugins/qmlprofiler/quick3dframemodel.cpp index 0774a9315c2..1e99fde12e5 100644 --- a/src/plugins/qmlprofiler/quick3dframemodel.cpp +++ b/src/plugins/qmlprofiler/quick3dframemodel.cpp @@ -443,7 +443,7 @@ QList Quick3DFrameModel::frameIndices(const QString &view3DFilter) const { QList ret; int key = -1; - if (view3DFilter != Tr::tr("All")) { + if (view3DFilter != Tr::tr("All", "All frames")) { for (int v3d : m_frameTimes.keys()) { if (m_modelManager->eventType(m_eventData[v3d]).data() == view3DFilter) { key = v3d; @@ -484,7 +484,7 @@ void Quick3DFrameModel::setFilterFrame(const QString &frame) void Quick3DFrameModel::setFilterView3D(const QString &view3D) { int key = -1; - if (view3D != Tr::tr("All")) { + if (view3D != Tr::tr("All", "All View3D frames")) { for (int v3d : m_frameTimes.keys()) { if (m_modelManager->eventType(m_eventData[v3d]).data() == view3D) { key = v3d; diff --git a/src/plugins/qmlprofiler/quick3dframeview.cpp b/src/plugins/qmlprofiler/quick3dframeview.cpp index d0b59afc703..78bbc53d651 100644 --- a/src/plugins/qmlprofiler/quick3dframeview.cpp +++ b/src/plugins/qmlprofiler/quick3dframeview.cpp @@ -81,12 +81,12 @@ Quick3DFrameView::Quick3DFrameView(QmlProfilerModelManager *profilerModelManager groupLayout->addLayout(hMainLayout); connect(model, &Quick3DFrameModel::modelReset, [model, view3DComboModel, frameComboModel](){ QStringList list; - list << Tr::tr("All"); + list << Tr::tr("All", "All View3D frames"); list << model->view3DNames(); view3DComboModel->setStringList(list); list.clear(); list << Tr::tr("None", "Compare Frame: None"); - list << model->frameNames(Tr::tr("All")); + list << model->frameNames(Tr::tr("All", "Compare Frame: All")); frameComboModel->setStringList(list); }); connect(view3DComboBox, &QComboBox::currentTextChanged, [this, model, frameComboModel](const QString &text){ @@ -161,7 +161,7 @@ Quick3DMainView::Quick3DMainView(Quick3DFrameModel *model, bool compareView, QWi void Quick3DMainView::setFilterView3D(const QString &objectName) { - if (objectName == Tr::tr("All")) + if (objectName == Tr::tr("All", "All View3D frames")) m_sortModel->setFilterFixedString(""); else m_sortModel->setFilterFixedString(objectName); diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 62aabe6e7e2..df01eb76f17 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -437,7 +437,8 @@ QtSettingsPageWidget::QtSettingsPageWidget() m_documentationSetting->addItem(Tr::tr("Highest Version Only"), int(QtVersionManager::DocumentationSetting::HighestOnly)); - m_documentationSetting->addItem(Tr::tr("All"), int(QtVersionManager::DocumentationSetting::All)); + m_documentationSetting->addItem( + Tr::tr("All", "All documentation"), int(QtVersionManager::DocumentationSetting::All)); m_documentationSetting->addItem( Tr::tr("None", "No documentation"), int(QtVersionManager::DocumentationSetting::None)); const int selectedIndex = m_documentationSetting->findData(