feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Disambiguate translations for "All"

Browse Source 
Translations can be different depending on context.
Give each usage a disambiguation text.

Task-number: QTCREATORBUG-31978
Change-Id: I5fe854f96ce285943ff47993cd6d56db603d1c27
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2024-12-13 12:25:47 +01:00
parent 705dcb17b8
commit 638874edfb
11 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/extensionsystem/plugindetailsview.cpp
View File

@@ -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);

2
src/plugins/android/androidsdkmanagerdialog.cpp
View File

@@ -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..."));

2
src/plugins/autotest/projectsettingswidget.cpp
View File

@@ -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."));

2
src/plugins/autotest/testsettings.cpp
View File

@@ -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();

8
src/plugins/cppeditor/symbolsfindfilter.cpp
View File

@@ -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

6
src/plugins/extensionmanager/extensionsbrowser.cpp
View File

@@ -448,10 +448,8 @@ public:
{
static const QList<FilterOption> 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"),

8
src/plugins/git/gitclient.cpp
View File

@@ -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"},

2
src/plugins/projectexplorer/projectexplorersettings.cpp
View File

@@ -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));

4
src/plugins/qmlprofiler/quick3dframemodel.cpp
View File

@@ -443,7 +443,7 @@ QList<int> Quick3DFrameModel::frameIndices(const QString &view3DFilter) const
{
QList<int> 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;

6
src/plugins/qmlprofiler/quick3dframeview.cpp
View File

@@ -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);

3
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -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(