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

Tr: Fix some source texts

Browse Source 
Change-Id: I06458b177af2691a362368faed2b6bea3883a2f5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Jarek Kobus
2023-10-16 19:56:53 +02:00
parent aee3d93237
commit 5cb40870b1
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/advanceddockingsystem/dockmanager.cpp
View File

@@ -1345,13 +1345,13 @@ expected_str<QString> DockManager::exportWorkspace(const QString &targetFilePath
// Check if the target directory exists // Check if the target directory exists
if (!targetFile.parentDir().exists()) if (!targetFile.parentDir().exists())
return make_unexpected( return make_unexpected(
Tr::tr("Directory does not exist\"%1\".").arg(targetFile.parentDir().toUserOutput())); Tr::tr("The directory \"%1\" does not exist.").arg(targetFile.parentDir().toUserOutput()));
// Check if the workspace exists // Check if the workspace exists
const FilePath workspaceFile = userDirectory().pathAppended(sourceFileName); const FilePath workspaceFile = userDirectory().pathAppended(sourceFileName);
if (!workspaceFile.exists()) if (!workspaceFile.exists())
return make_unexpected( return make_unexpected(
Tr::tr("Workspace does not exist \"%1\"").arg(workspaceFile.toUserOutput())); Tr::tr("The workspace \"%1\" does not exist ").arg(workspaceFile.toUserOutput()));
// Finally copy the workspace to the target // Finally copy the workspace to the target
const expected_str<void> copyResult = workspaceFile.copyFile(targetFile); const expected_str<void> copyResult = workspaceFile.copyFile(targetFile);

2
src/plugins/clangcodemodel/clangdfollowsymbol.cpp
View File

@@ -340,7 +340,7 @@ IAssistProposal *ClangdFollowSymbol::VirtualFunctionAssistProcessor::createPropo
items << createEntry({}, m_followSymbol->d->defLink); items << createEntry({}, m_followSymbol->d->defLink);
if (!final) { if (!final) {
const auto infoItem = new VirtualFunctionProposalItem({}, false); const auto infoItem = new VirtualFunctionProposalItem({}, false);
infoItem->setText(Tr::tr("collecting overrides ...")); infoItem->setText(Tr::tr("collecting overrides..."));
infoItem->setOrder(-1); infoItem->setOrder(-1);
items << infoItem; items << infoItem;
} }

5
src/plugins/coreplugin/vcsmanager.cpp
View File

@@ -333,8 +333,9 @@ FilePaths VcsManager::promptToDelete(IVersionControl *vc, const FilePaths &fileP
return fp.toUserOutput(); return fp.toUserOutput();
}).join("</li><li>") + "</li></ul>"; }).join("</li><li>") + "</li></ul>";
const QString title = Tr::tr("Version Control"); const QString title = Tr::tr("Version Control");
const QString msg = Tr::tr("Remove the following files from the version control system (%2)? " const QString msg = Tr::tr("Remove the following files from the version control system (%1)?")
"%1Note: This might remove the local file.").arg(fileListForUi, vc->displayName()); .arg(vc->displayName())
+ fileListForUi + Tr::tr("Note: This might remove the local file.");
const QMessageBox::StandardButton button = const QMessageBox::StandardButton button =
QMessageBox::question(ICore::dialogParent(), title, msg, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); QMessageBox::question(ICore::dialogParent(), title, msg, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
if (button != QMessageBox::Yes) if (button != QMessageBox::Yes)

2
src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
View File

@@ -94,7 +94,7 @@ public:
QTC_ASSERT(m_params.function, return nullptr); QTC_ASSERT(m_params.function, return nullptr);
auto *hintItem = new VirtualFunctionProposalItem(Utils::Link()); auto *hintItem = new VirtualFunctionProposalItem(Utils::Link());
hintItem->setText(Tr::tr("collecting overrides ...")); hintItem->setText(Tr::tr("collecting overrides..."));
hintItem->setOrder(-1000); hintItem->setOrder(-1000);
QList<AssistProposalItemInterface *> items; QList<AssistProposalItemInterface *> items;

2
src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
View File

@@ -449,7 +449,7 @@ F2TestCase::F2TestCase(CppEditorAction action,
first.text = "<base declaration>"; first.text = "<base declaration>";
expectedImmediate << first; expectedImmediate << first;
} }
expectedImmediate << OverrideItem(QLatin1String("collecting overrides ...")); expectedImmediate << OverrideItem(QLatin1String("collecting overrides..."));
} }
QCOMPARE(immediateVirtualSymbolResults, expectedImmediate); QCOMPARE(immediateVirtualSymbolResults, expectedImmediate);
if (useClangd) { if (useClangd) {