Improve translatable strings

Change-Id: I0104209bb0f865a48f9ca2524f62457f7524bba9
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Robert Löhning
2021-03-23 22:13:23 +01:00
parent b994bb7bd6
commit cd0a140bde
7 changed files with 13 additions and 20 deletions

View File

@@ -421,17 +421,17 @@ void BoostTestOutputReader::onFinished(int exitCode, QProcess::ExitStatus /*exit
if (m_logLevel == LogLevel::Nothing && m_reportLevel == ReportLevel::No) {
switch (exitCode) {
case 0:
reportNoOutputFinish(tr("Running tests exited with ") + "boost::exit_success.",
reportNoOutputFinish(tr("Running tests exited with %1").arg("boost::exit_success."),
ResultType::Pass);
break;
case 200:
reportNoOutputFinish(
tr("Running tests exited with ") + "boost::exit_test_exception.",
tr("Running tests exited with %1").arg("boost::exit_test_exception."),
ResultType::MessageFatal);
break;
case 201:
reportNoOutputFinish(tr("Running tests exited with ")
+ "boost::exit_test_failure.", ResultType::Fail);
reportNoOutputFinish(tr("Running tests exited with %1")
.arg("boost::exit_test_failure."), ResultType::Fail);
break;
}
} else if (exitCode != 0 && exitCode != 201 && !m_description.isEmpty()) {

View File

@@ -1155,7 +1155,7 @@ void ClangTool::updateForCurrentState()
const bool hasErrorText = !m_infoBarWidget->errorText().isEmpty();
const bool hasErrors = m_filesFailed > 0;
if (hasErrors && !hasErrorText) {
const QString text = makeLink( tr("Failed to analyze %1 files.").arg(m_filesFailed));
const QString text = makeLink(tr("Failed to analyze %n file(s).", nullptr, m_filesFailed));
m_infoBarWidget->setError(InfoBarWidget::Warning, text, [this]() { showOutputPane(); });
}
@@ -1171,9 +1171,8 @@ void ClangTool::updateForCurrentState()
if (m_filesCount == 0) {
infoText = tr("Analyzing..."); // Not yet fully started/initialized
} else {
infoText = tr("Analyzing... %1 of %2 files processed.")
.arg(m_filesSucceeded + m_filesFailed)
.arg(m_filesCount);
infoText = tr("Analyzing... %1 of %n file(s) processed.", nullptr, m_filesCount)
.arg(m_filesSucceeded + m_filesFailed);
}
break;
case State::PreparationStarted:
@@ -1186,7 +1185,7 @@ void ClangTool::updateForCurrentState()
infoText = tr("Analysis stopped by user.");
break;
case State::AnalyzerFinished:
infoText = tr("Finished processing %1 files.").arg(m_filesCount);
infoText = tr("Finished processing %n file(s).", nullptr, m_filesCount);
break;
case State::ImportFinished:
infoText = tr("Diagnostics imported.");

View File

@@ -418,7 +418,7 @@ void ClangToolRunWorker::finalize()
{
const QString toolName = tool()->name();
if (m_filesNotAnalyzed.size() != 0) {
appendMessage(tr("Error: Failed to analyze %1 files.").arg(m_filesNotAnalyzed.size()),
appendMessage(tr("Error: Failed to analyze %n files.", nullptr, m_filesNotAnalyzed.size()),
ErrorMessageFormat);
Target *target = runControl()->target();
if (target && target->activeBuildConfiguration() && !target->activeBuildConfiguration()->buildDirectory().exists()

View File

@@ -10,9 +10,6 @@
<height>345</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_custom">

View File

@@ -10,9 +10,6 @@
<height>1074</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QGroupBox" name="groupBox_2">

View File

@@ -96,8 +96,8 @@ void SignalList::prepareDialog()
m_dialog = new SignalListDialog(Core::ICore::dialogParent());
m_dialog->setAttribute(Qt::WA_DeleteOnClose);
m_dialog->initialize(m_model);
m_dialog->setWindowTitle(::QmlDesigner::SignalList::tr("Signal List for ")
+ m_modelNode.validId());
m_dialog->setWindowTitle(::QmlDesigner::SignalList::tr("Signal List for %1")
.arg(m_modelNode.validId()));
auto *delegate = static_cast<SignalListDelegate *>(m_dialog->tableView()->itemDelegate());
connect(delegate, &SignalListDelegate::connectClicked, this, &SignalList::connectClicked);

View File

@@ -546,10 +546,10 @@ void SubmitEditorWidget::verifyDescription()
"<ul>"
"<li>Avoid very short commit messages.</li>"
"<li>Consider the first line as subject (like in email) "
"and keep it shorter than %1 characters.</li>"
"and keep it shorter than %n characters.</li>"
"<li>After an empty second line, a longer description can be added.</li>"
"<li>Describe why the change was done, not how it was done.</li>"
"</ul>").arg(MaxSubjectLength));
"</ul>", nullptr, MaxSubjectLength));
}
}