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

UI text: Fix spacing in multi-line messages

Browse Source 
You need an empty space at the end of a line (before quotes),
but no empty space after \n.

Task-number: QTCREATORBUG-28334
Change-Id: I192836cb10b819a359778879c64e6b80aaa059f2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Leena Miettinen
2022-10-19 18:39:25 +02:00
parent 3ac5051af9
commit b9e45d7b30
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/translations/qtcreator_ja.ts
View File

@@ -14492,7 +14492,7 @@ Note: This might remove the local file.</source>
<translation type="vanished">以下のファイルをバージョン管理システム (%2) から削除しますか? %1注: これにより、ローカル・ファイルが削除される場合があります。</translation>
</message>
<message>
<source>Remove the following files from the version control system (%2)?%1Note: This might remove the local file.</source>
<source>Remove the following files from the version control system (%2)? %1Note: This might remove the local file.</source>
<translation>以下のファイルをバージョン管理システム (%2) から削除しますか? %1注: これにより、ローカルファイルが削除される場合があります。</translation>
</message>
<message>

2
share/qtcreator/translations/qtcreator_ru.ts
View File

@@ -27671,7 +27671,7 @@ You might find further explanations in the Application Output view.</source>
<translation>Задержка обработки: %1.%2 сек</translation>
</message>
<message>
<source>Invalid data format. The trace file&apos;s identification string is &quot;%1&quot;.An acceptable trace file should have &quot;%2&quot;. You cannot read trace files generated with older versions of Qt Creator.</source>
<source>Invalid data format. The trace file&apos;s identification string is &quot;%1&quot;. An acceptable trace file should have &quot;%2&quot;. You cannot read trace files generated with older versions of Qt Creator.</source>
<translation>Неверный формат данных. У файла трассировки задана строка идентификации «%1». А допустимой является «%2». Нельзя читать файлы трассировки, созданные старыми версиями Qt Creator.</translation>
</message>
<message>

2
src/plugins/coreplugin/systemsettings.cpp
View File

@@ -223,7 +223,7 @@ public:
m_autoSaveRefactoringCheckBox->setChecked(EditorManager::autoSaveAfterRefactoring());
m_autoSaveRefactoringCheckBox->setToolTip(
tr("Automatically saves all open files "
"affected by a refactoring operation,\n provided they were unmodified before the "
"affected by a refactoring operation,\nprovided they were unmodified before the "
"refactoring."));
m_autoSaveInterval->setValue(EditorManagerPrivate::autoSaveInterval());
m_autoSuspendCheckBox->setChecked(EditorManagerPrivate::autoSuspendEnabled());

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

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

2
src/plugins/debugger/debuggeractions.cpp
View File

@@ -104,7 +104,7 @@ DebuggerSettings::DebuggerSettings()
"in system logs."));
fontSizeFollowsEditor.setSettingsKey(debugModeGroup, "FontSizeFollowsEditor");
fontSizeFollowsEditor.setToolTip(Tr::tr("Changes the font size in the debugger views when"
fontSizeFollowsEditor.setToolTip(Tr::tr("Changes the font size in the debugger views when "
"the font size in the main editor changes."));
fontSizeFollowsEditor.setLabelText(Tr::tr("Debugger font size follows main editor"));

2
src/plugins/perfprofiler/perfprofilertracefile.cpp
View File

@@ -247,7 +247,7 @@ void PerfProfilerTraceFile::readFromDevice()
} else if (strncmp(magic.data(), Constants::PerfZqfileMagic, magicSize) == 0) {
m_compressed = true;
} else {
fail(Tr::tr("Invalid data format. The trace file's identification string is \"%1\"."
fail(Tr::tr("Invalid data format. The trace file's identification string is \"%1\". "
"An acceptable trace file should have \"%2\". You cannot read trace files "
"generated with older versions of %3.")
.arg(QString::fromLatin1(magic))

6
src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
View File

@@ -217,7 +217,7 @@ void QmlProjectPlugin::openInQDSWithProject(const Utils::FilePath &filePath)
Core::AsynchronousMessageBox::warning(
tr("Qt Design Studio"),
tr("No project file (*.qmlproject) found for Qt Design "
"Studio.\n Qt Design Studio requires a .qmlproject "
"Studio.\nQt Design Studio requires a .qmlproject "
"based project to open the .ui.qml file."));
}
}
@@ -272,7 +272,7 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
if (QmlProject::isQtDesignStudio()) {
Core::ActionContainer *menu = Core::ActionManager::actionContainer(
ProjectExplorer::Constants::M_FILECONTEXT);
QAction *mainfileAction = new QAction(tr("Set as main .qml file"), this);
QAction *mainfileAction = new QAction(tr("Set as Main .qml File"), this);
mainfileAction->setEnabled(false);
connect(mainfileAction, &QAction::triggered, this, []() {
@@ -315,7 +315,7 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
!= fileNode->filePath());
});
QAction *mainUifileAction = new QAction(tr("Set as main .ui.qml file"), this);
QAction *mainUifileAction = new QAction(tr("Set as Main .ui.qml File"), this);
mainUifileAction->setEnabled(false);
connect(mainUifileAction, &QAction::triggered, this, []() {