Some more tr fixes

- avoid manual line breaks
- fix plural
- add some translator comments
- explicitly name an output pane
- use imperative for placeholder text
- it is a Markdown editor nowadays, not a viewer

Change-Id: I8418cfe0294c028b7d873305db0af4c25bc1097f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Eike Ziller
2023-06-13 15:39:19 +02:00
parent 4e73069358
commit c35dca17b8
9 changed files with 22 additions and 16 deletions

View File

@@ -177,15 +177,15 @@ void ClangFormatGlobalConfigWidget::initOverrideCheckBox()
connect(m_indentingOrFormatting, &QComboBox::currentIndexChanged, connect(m_indentingOrFormatting, &QComboBox::currentIndexChanged,
this, setEnableOverrideCheckBox); this, setEnableOverrideCheckBox);
m_overrideDefault->setToolTip(Tr::tr( m_overrideDefault->setToolTip("<html>"
"When this option is enabled, ClangFormat will use a\n" + Tr::tr("When this option is enabled, ClangFormat will use a "
"user-specified configuration from the widget below,\n" "user-specified configuration from the widget below, "
"instead of the project .clang-format file. You can\n" "instead of the project .clang-format file. You can "
"customize the formatting options for your code by\n" "customize the formatting options for your code by "
"adjusting the settings in the widget. Note that any\n" "adjusting the settings in the widget. Note that any "
"changes made there will only affect the current\n" "changes made there will only affect the current "
"configuration, and will not modify the project\n" "configuration, and will not modify the project "
".clang-format file.")); ".clang-format file."));
m_overrideDefault->setChecked(getProjectOverriddenSettings(m_project)); m_overrideDefault->setChecked(getProjectOverriddenSettings(m_project));
setTemporarilyReadOnly(); setTemporarilyReadOnly();

View File

@@ -145,7 +145,7 @@ QVariantMap PerfTimelineModel::details(int index) const
manager->traceDuration())); manager->traceDuration()));
const int guessedFrames = -frame.numSamples; const int guessedFrames = -frame.numSamples;
if (guessedFrames > 0) if (guessedFrames > 0)
result.insert(Tr::tr("Guessed"), Tr::tr("%n frames", nullptr, guessedFrames)); result.insert(Tr::tr("Guessed"), Tr::tr("%n frame(s)", nullptr, guessedFrames));
for (int i = 0, end = numAttributes(index); i < end; ++i) { for (int i = 0, end = numAttributes(index); i < end; ++i) {
const auto &name = orUnknown(manager->string( const auto &name = orUnknown(manager->string(
manager->attribute(attributeId(index, i)).name)); manager->attribute(attributeId(index, i)).name));

View File

@@ -121,6 +121,7 @@ void DeviceSettingsWidget::initGui()
if (!factory->quickCreationAllowed()) if (!factory->quickCreationAllowed())
continue; continue;
//: Add <Device Type Name>
QAction *action = new QAction(Tr::tr("Add %1").arg(factory->displayName())); QAction *action = new QAction(Tr::tr("Add %1").arg(factory->displayName()));
deviceTypeMenu->addAction(action); deviceTypeMenu->addAction(action);

View File

@@ -65,7 +65,8 @@ EnvironmentAspectWidget::EnvironmentAspectWidget(EnvironmentAspect *aspect)
topLayout->addWidget(m_environmentWidget); topLayout->addWidget(m_environmentWidget);
if (m_aspect->isPrintOnRunAllowed()) { if (m_aspect->isPrintOnRunAllowed()) {
const auto printOnRunCheckBox = new QCheckBox(Tr::tr("Show in output pane when running")); const auto printOnRunCheckBox = new QCheckBox(
Tr::tr("Show in Application Output when running"));
printOnRunCheckBox->setChecked(m_aspect->isPrintOnRunEnabled()); printOnRunCheckBox->setChecked(m_aspect->isPrintOnRunEnabled());
connect(printOnRunCheckBox, &QCheckBox::toggled, connect(printOnRunCheckBox, &QCheckBox::toggled,
m_aspect, &EnvironmentAspect::setPrintOnRun); m_aspect, &EnvironmentAspect::setPrintOnRun);

View File

@@ -502,7 +502,7 @@ ExecutableAspect::ExecutableAspect(Target *target, ExecutionDeviceSelector selec
setId("ExecutableAspect"); setId("ExecutableAspect");
addDataExtractor(this, &ExecutableAspect::executable, &Data::executable); addDataExtractor(this, &ExecutableAspect::executable, &Data::executable);
m_executable.setPlaceHolderText(Tr::tr("path to the executable cannot be empty")); m_executable.setPlaceHolderText(Tr::tr("Enter the path to the executable"));
m_executable.setLabelText(Tr::tr("Executable:")); m_executable.setLabelText(Tr::tr("Executable:"));
m_executable.setDisplayStyle(StringAspect::LabelDisplay); m_executable.setDisplayStyle(StringAspect::LabelDisplay);

View File

@@ -240,6 +240,7 @@ QString QbsSession::errorString(QbsSession::Error error)
case Error::ProtocolError: case Error::ProtocolError:
return Tr::tr("The qbs process sent unexpected data."); return Tr::tr("The qbs process sent unexpected data.");
case Error::VersionMismatch: case Error::VersionMismatch:
//: %1 == "Qt Creator" or "Qt Design Studio"
return Tr::tr("The qbs API level is not compatible with " return Tr::tr("The qbs API level is not compatible with "
"what %1 expects.") "what %1 expects.")
.arg(Core::Constants::IDE_DISPLAY_NAME); .arg(Core::Constants::IDE_DISPLAY_NAME);

View File

@@ -150,6 +150,7 @@ public:
m_qbsExePathChooser.setFilePath(QbsSettings::qbsExecutableFilePath()); m_qbsExePathChooser.setFilePath(QbsSettings::qbsExecutableFilePath());
m_defaultInstallDirLineEdit.setText(QbsSettings::defaultInstallDirTemplate()); m_defaultInstallDirLineEdit.setText(QbsSettings::defaultInstallDirTemplate());
m_versionLabel.setText(getQbsVersionString()); m_versionLabel.setText(getQbsVersionString());
//: %1 == "Qt Creator" or "Qt Design Studio"
m_settingsDirCheckBox.setText(Tr::tr("Use %1 settings directory for Qbs") m_settingsDirCheckBox.setText(Tr::tr("Use %1 settings directory for Qbs")
.arg(Core::Constants::IDE_DISPLAY_NAME)); .arg(Core::Constants::IDE_DISPLAY_NAME));
m_settingsDirCheckBox.setChecked(QbsSettings::useCreatorSettingsDirForQbs()); m_settingsDirCheckBox.setChecked(QbsSettings::useCreatorSettingsDirForQbs());

View File

@@ -417,9 +417,11 @@ public:
QObject::connect(useCustomAnalyzer, &QCheckBox::stateChanged, this, [this](int checked){ QObject::connect(useCustomAnalyzer, &QCheckBox::stateChanged, this, [this](int checked){
analyzerMessagesView->setEnabled(checked != Qt::Unchecked); analyzerMessagesView->setEnabled(checked != Qt::Unchecked);
}); });
analyzerMessagesView->setToolTip(Tr::tr("Enabled checks can be disabled for non Qt Quick UI" analyzerMessagesView->setToolTip(
" files,\nbut disabled checks cannot get explicitly" "<html>"
" enabled for non Qt Quick UI files.")); + Tr::tr("Enabled checks can be disabled for non Qt Quick UI"
" files, but disabled checks cannot get explicitly"
" enabled for non Qt Quick UI files."));
analyzerMessagesView->setContextMenuPolicy(Qt::CustomContextMenu); analyzerMessagesView->setContextMenuPolicy(Qt::CustomContextMenu);
connect(analyzerMessagesView, &QTreeView::customContextMenuRequested, connect(analyzerMessagesView, &QTreeView::customContextMenuRequested,
this, &QmlJsEditingSettingsPageWidget::showContextMenu); this, &QmlJsEditingSettingsPageWidget::showContextMenu);

View File

@@ -322,7 +322,7 @@ MarkdownEditorFactory::MarkdownEditorFactory()
}) })
{ {
setId(MARKDOWNVIEWER_ID); setId(MARKDOWNVIEWER_ID);
setDisplayName(::Core::Tr::tr("Markdown Viewer")); setDisplayName(::Core::Tr::tr("Markdown Editor"));
addMimeType(MARKDOWNVIEWER_MIME_TYPE); addMimeType(MARKDOWNVIEWER_MIME_TYPE);
setEditorCreator([] { return new MarkdownEditor; }); setEditorCreator([] { return new MarkdownEditor; });
} }