diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 5d84dd74efe..d857bbabeab 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -14492,7 +14492,7 @@ Note: This might remove the local file. 以下のファイルをバージョン管理システム (%2) から削除しますか? %1注: これにより、ローカル・ファイルが削除される場合があります。 - Remove the following files from the version control system (%2)?%1Note: This might remove the local file. + Remove the following files from the version control system (%2)? %1Note: This might remove the local file. 以下のファイルをバージョン管理システム (%2) から削除しますか? %1注: これにより、ローカルファイルが削除される場合があります。 diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 5bdbc409b9f..3c581a58e20 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -27671,7 +27671,7 @@ You might find further explanations in the Application Output view. Задержка обработки: %1.%2 сек - 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 Qt Creator. + 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 Qt Creator. Неверный формат данных. У файла трассировки задана строка идентификации «%1». А допустимой является «%2». Нельзя читать файлы трассировки, созданные старыми версиями Qt Creator. diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp index 1213812bd4a..49f685d693e 100644 --- a/src/plugins/coreplugin/systemsettings.cpp +++ b/src/plugins/coreplugin/systemsettings.cpp @@ -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()); diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index e547ba8ab64..856d5e7acac 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -336,7 +336,7 @@ FilePaths VcsManager::promptToDelete(IVersionControl *vc, const FilePaths &fileP return fp.toUserOutput(); }).join("
  • ") + "
  • "; 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); diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index 68d9d846b3a..0dec35b3fd4 100644 --- a/src/plugins/debugger/debuggeractions.cpp +++ b/src/plugins/debugger/debuggeractions.cpp @@ -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")); diff --git a/src/plugins/perfprofiler/perfprofilertracefile.cpp b/src/plugins/perfprofiler/perfprofilertracefile.cpp index 5d35a9cc10f..ca9304fd443 100644 --- a/src/plugins/perfprofiler/perfprofilertracefile.cpp +++ b/src/plugins/perfprofiler/perfprofilertracefile.cpp @@ -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)) diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 424af299126..270920968bd 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -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, []() {