Some fixes in translated strings

- doesn't make sense to translate "%1"
- showPreprocessedFile: "reason" contains full stop, put at the end
- add missing closing >
- remove whitespace at the end of translated string
- added missing quotes and full stops
- Remove some control text from tr

Change-Id: I5537c3d12d038e25e2209af1198129fbf959b43c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Eike Ziller
2023-02-14 16:14:08 +01:00
parent b2815c39b1
commit 379bf65e96
21 changed files with 83 additions and 92 deletions

View File

@@ -491,9 +491,9 @@ void CMakeBuildSystem::combineScanAndParse(bool restoredFromBackup)
project()->addIssue(
CMakeProject::IssueType::Warning,
Tr::tr("<b>CMake configuration failed<b>"
"<p>The backup of the previous configuration has been restored.</p>"
"<p>Issues and \"Projects > Build\" settings "
"show more information about the failure.</p"));
"<p>The backup of the previous configuration has been restored.</p>"
"<p>Issues and \"Projects > Build\" settings "
"show more information about the failure.</p>"));
m_reader.resetData();
@@ -506,11 +506,10 @@ void CMakeBuildSystem::combineScanAndParse(bool restoredFromBackup)
} else {
updateFallbackProjectData();
project()->addIssue(
CMakeProject::IssueType::Warning,
Tr::tr("<b>Failed to load project<b>"
"<p>Issues and \"Projects > Build\" settings "
"show more information about the failure.</p"));
project()->addIssue(CMakeProject::IssueType::Warning,
Tr::tr("<b>Failed to load project<b>"
"<p>Issues and \"Projects > Build\" settings "
"show more information about the failure.</p>"));
}
}
}

View File

@@ -190,7 +190,7 @@ void CMakeTargetNode::build()
void CMakeTargetNode::setTargetInformation(const QList<FilePath> &artifacts, const QString &type)
{
m_tooltip = Tr::tr("Target type: ") + type + "<br>";
m_tooltip = Tr::tr("Target type:") + " " + type + "<br>";
if (artifacts.isEmpty()) {
m_tooltip += Tr::tr("No build artifacts");
} else {

View File

@@ -285,8 +285,8 @@ void FileApiReader::makeBackupConfiguration(bool store)
replyPrev.removeRecursively();
QTC_CHECK(!replyPrev.exists());
if (!reply.renameFile(replyPrev))
Core::MessageManager::writeFlashing(Tr::tr("Failed to rename %1 to %2.")
.arg(reply.toString(), replyPrev.toString()));
Core::MessageManager::writeFlashing(Tr::tr("Failed to rename \"%1\" to \"%2\".")
.arg(reply.toString(), replyPrev.toString()));
}
FilePath cmakeCacheTxt = m_parameters.buildDirectory.pathAppended("CMakeCache.txt");
@@ -296,9 +296,9 @@ void FileApiReader::makeBackupConfiguration(bool store)
if (cmakeCacheTxt.exists())
if (!FileUtils::copyIfDifferent(cmakeCacheTxt, cmakeCacheTxtPrev))
Core::MessageManager::writeFlashing(Tr::tr("Failed to copy %1 to %2.")
.arg(cmakeCacheTxt.toString(), cmakeCacheTxtPrev.toString()));
Core::MessageManager::writeFlashing(
Tr::tr("Failed to copy \"%1\" to \"%2\".")
.arg(cmakeCacheTxt.toString(), cmakeCacheTxtPrev.toString()));
}
void FileApiReader::writeConfigurationIntoBuildDirectory(const QStringList &configurationArguments)

View File

@@ -394,7 +394,7 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
{
const Utils::expected_str<QByteArray> jsonContents = jsonFile.fileContents();
if (!jsonContents) {
errorMessage = Tr::tr("Failed to read %1 file").arg(jsonFile.fileName());
errorMessage = Tr::tr("Failed to read file \"%1\".").arg(jsonFile.fileName());
return false;
}
@@ -410,14 +410,14 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
}
if (!jsonDoc.isObject()) {
errorMessage = Tr::tr( "Invalid %1 file").arg(jsonFile.fileName());
errorMessage = Tr::tr("Invalid file \"%1\".").arg(jsonFile.fileName());
return false;
}
QJsonObject root = jsonDoc.object();
if (!parseVersion(root.value("version"), m_presetsData.version)) {
errorMessage = Tr::tr("Invalid \"version\" in %1 file").arg(jsonFile.fileName());
errorMessage = Tr::tr("Invalid \"version\" in file \"%1\".").arg(jsonFile.fileName());
return false;
}