diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index c96e36d85bb..1e867abbcbd 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -10547,8 +10547,8 @@ přidat do správy verzí (%2)? Při ukládání sezení se vyskytla chyba - Could not save session to file %1 - Sezení se nepodařilo uložit do souboru %1 + Could not save session to file "%1" + Sezení se nepodařilo uložit do souboru "%1" Untitled diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 210c99ebbb6..1a285e8c8ad 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -7810,8 +7810,8 @@ Vil du dræbe den? Patch-kommandoen konfigureret i de generelle "Miljø"-indstillinger findes ikke. - Running in %1: %2 %3 - Kører om %1: %2 %3 + Running in "%1": %2 %3 + Kører om "%1": %2 %3 Unable to launch "%1": %2 @@ -24940,8 +24940,8 @@ Disse filer bevares. Fejl ved gemning af session - Could not save session to file %1 - Kunne ikke gemme session til filen %1 + Could not save session to file "%1" + Kunne ikke gemme session til filen "%1" Untitled diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 28c1cfb917e..9b29bb1bf08 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -13043,8 +13043,8 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev %1 konnte nicht geladen werden: %2 - Attempt to include %1 which was already parsed. - Versuch, die Datei %1 einzufügen, welche schon ausgewertet wurde. + Attempt to include "%1" which was already parsed. + Versuch, die Datei "%1" einzufügen, welche schon ausgewertet wurde. yes @@ -13408,8 +13408,8 @@ Möchten Sie den Pfad zu den Quelldateien in die Zwischenablage kopieren?Keine gültige ausführbare CMake-Datei - Running in %1: %2 - Führe in %1 aus: %2 + Running in "%1": %2 + Führe in "%1" aus: %2 <No CMake Tool available> @@ -16566,8 +16566,8 @@ Trotzdem fortfahren? Das in den allgemeinen Umgebungseinstellungen konfigurierte patch-Kommando existiert nicht. - Running in %1: %2 %3 - Führe in %1 aus: %2 %3 + Running in "%1": %2 %3 + Führe in "%1" aus: %2 %3 Unable to launch "%1": %2 @@ -20465,8 +20465,8 @@ Dies ist normalerweise nicht empfehlenswert, da die Datei wahrscheinlich währen Möchten Sie stattdessen "%1" bearbeiten? - Open %1 - %1 öffnen + Open "%1" + "%1" öffnen &Refactor @@ -35824,8 +35824,8 @@ Rename %2 to %3 anyway? Fehler beim Speichern der Sitzung - Could not save session to file %1 - Die Sitzung konnte nicht unter %1 gespeichert werden + Could not save session to file "%1" + Die Sitzung konnte nicht unter "%1" gespeichert werden Untitled @@ -40167,12 +40167,12 @@ fails because Clang does not understand the target architecture. Ausführbare Datei ist leer. - %1 does not exist. - %1 existiert nicht. + "%1" does not exist. + "%1" existiert nicht. - %1 is not an executable file. - %1 ist keine ausführbare Datei. + "%1" is not an executable file. + "%1" ist keine ausführbare Datei. &Add @@ -41539,8 +41539,8 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D Das Ausgabeverzeichnis "%1" konnte nicht angelegt werden - Running in %1: %2 - Führe in %1 aus: %2 + Running in "%1": %2 + Führe in "%1" aus: %2 Build @@ -51138,12 +51138,12 @@ Die Trace-Daten sind verloren. copyFile ist für "%1" nicht implementiert - Cannot copy from %1, it is not a directory. - %1 kann nicht kopiert werden, da es kein Verzeichnis ist. + Cannot copy from "%1", it is not a directory. + "%1" kann nicht kopiert werden, da es kein Verzeichnis ist. - Cannot copy %1 to %2, it is not a writable directory. - %1 kann nicht nach %2 kopiert werden, da es kein schreibbares Verzeichnis ist. + Cannot copy "%1" to "%2", it is not a writable directory. + "%1" kann nicht nach "%2" kopiert werden, da es kein schreibbares Verzeichnis ist. Failed to copy recursively from "%1" to "%2" while trying to create tar archive from source: %3 @@ -51254,14 +51254,12 @@ Die Trace-Daten sind verloren. Arbeitsbereiche löschen - Delete workspace %1? - Arbeitsbereich %1 löschen? + Delete workspace "%1"? + Arbeitsbereich "%1" löschen? - Delete these workspaces? - %1 - Diese Arbeitsbereiche löschen? - %1 + Delete these workspaces? + Diese Arbeitsbereiche löschen? File Error @@ -53268,8 +53266,8 @@ Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersuch Führe aus: %1 - Running in %1: %2 - Führe in %1 aus: %2 + Running in "%1": %2 + Führe in "%1" aus: %2 Failed to retrieve data. diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index ff32f1a64cb..a4dc26ed74f 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -7179,8 +7179,8 @@ al control de versiones (%2)? Error guardando sesión - Could not save session to file %1 - No se pudo guardar la sesion al archivo %1 + Could not save session to file "%1" + No se pudo guardar la sesion al archivo "%1" Qt Creator diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 48fa7edbe0d..142772f5ca3 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -10837,8 +10837,8 @@ au système de gestion de version (%2) ? Erreur lors de l'enregistrement de la session - Could not save session to file %1 - Impossible d'enregistrer la session dans le fichier %1 + Could not save session to file "%1" + Impossible d'enregistrer la session dans le fichier "%1" Untitled diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 386c4d14929..228e7cae1cb 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -18572,8 +18572,8 @@ Do you want to kill it? U općim postavkama za „Okruženje” konfigurirana zakrpna naredba ne postoji. - Running in %1: %2 %3 - Pokrenuto u %1: %2 %3 + Running in "%1": %2 %3 + Pokrenuto u "%1": %2 %3 Unable to launch "%1": %2 @@ -35830,8 +35830,8 @@ What do you want to do? Radi: %1 %2 - Running in %1: %2 %3 - Radi u %1: %2 %3 + Running in "%1": %2 %3 + Radi u "%1": %2 %3 Name of the version control system in use by the current project. diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index ad58a02fa31..843d55c8525 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -11592,8 +11592,8 @@ a verziókövetőhöz (%2)? Hiba történt a szakasz mentése közben - Could not save session to file %1 - Nem sikerült a szakasz %1 fájlba mentése + Could not save session to file "%1" + Nem sikerült a szakasz "%1" fájlba mentése Qt Creator diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index ccd8832a98b..8e092a00d77 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -7033,8 +7033,8 @@ al VCS (%2)? Errore durante il salvataggio della sessione - Could not save session to file %1 - Impossibile salvare la sessione sul file %1 + Could not save session to file "%1" + Impossibile salvare la sessione sul file "%1" Qt Creator diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 6014b49996a..b89f6284987 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -24418,8 +24418,8 @@ to project "%2". セッション %1 を保存できませんでした - Could not save session to file %1 - セッション %1 を保存できません + Could not save session to file "%1" + セッション "%1" を保存できません Untitled @@ -42568,14 +42568,12 @@ Output: ワークスペースを削除する - Delete workspace %1? - ワークスペース %1 を削除しますか? + Delete workspace "%1"? + ワークスペース "%1" を削除しますか? - Delete these workspaces? - %1 - これらのワークスペースを削除しますか? - %1 + Delete these workspaces? + これらのワークスペースを削除しますか? Cannot Restore Workspace diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index be632f066de..8561c509630 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -7967,8 +7967,8 @@ do projektu "%2". Błąd podczas zachowywania sesji - Could not save session to file %1 - Nie można zachować sesji w pliku %1 + Could not save session to file "%1" + Nie można zachować sesji w pliku "%1" Untitled @@ -28622,8 +28622,8 @@ Do you want to check them out now? Brak skonfigurowanej komendy "patch" w głównych ustawieniach środowiska. - Running in %1: %2 %3 - Uruchamianie w %1: %2 %3 + Running in "%1": %2 %3 + Uruchamianie w "%1": %2 %3 Unable to launch "%1": %2 @@ -31184,8 +31184,8 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Uruchamianie: %1 %2 - Running in %1: %2 %3 - Uruchamianie w %1: %2 %3 + Running in "%1": %2 %3 + Uruchamianie w "%1": %2 %3 diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index f6c71e9dcfd..19b76c17def 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -32,14 +32,12 @@ Удалить сессии - Delete workspace %1? - Удалить сессию %1? + Delete workspace "%1"? + Удалить сессию "%1"? - Delete these workspaces? - %1 - Удалить следующие сессии? - %1 + Delete these workspaces? + Удалить следующие сессии? Cannot Restore Workspace @@ -10566,8 +10564,8 @@ Double-click to edit item. Команда patch, настроенная в общих настройках «Среды», отсутствует. - Running in %1: %2 %3 - Выполняется в %1: %2 %3 + Running in "%1": %2 %3 + Выполняется в "%1": %2 %3 Unable to launch "%1": %2 @@ -32162,8 +32160,8 @@ These files are preserved. Ошибка при сохранении сессии - Could not save session to file %1 - Не удалось сохранить сессию %1 + Could not save session to file "%1" + Не удалось сохранить сессию "%1" Untitled @@ -47662,8 +47660,8 @@ What do you want to do? Исполнение: %1 %2 - Running in %1: %2 %3 - Исполнение в %1: %2 %3 + Running in "%1": %2 %3 + Исполнение в "%1": %2 %3 &Undo diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 462ed14e8af..480193e4525 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -7426,8 +7426,8 @@ v sistem za nadzor različic (%2)? Napaka med shranjevanjem seje - Could not save session to file %1 - Ni bilo moč shraniti seje v datoteko %1 + Could not save session to file "%1" + Ni bilo moč shraniti seje v datoteko "%1" Untitled diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index c50e8d22385..f49ae08943f 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -14143,8 +14143,8 @@ Reason: %2 Помилка при збереженні сесії - Could not save session to file %1 - Не вдалось зберегти сесію до файлу %1 + Could not save session to file "%1" + Не вдалось зберегти сесію до файлу "%1" Untitled diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index b1e219464c2..4f079bcccb0 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -32,14 +32,12 @@ 删除工作区 - Delete workspace %1? - 删除 %1 工作区? + Delete workspace "%1"? + 删除 "%1" 工作区? - Delete these workspaces? - %1 - 删除这些工作区? - %1 + Delete these workspaces? + 删除这些工作区? Cannot Restore Workspace @@ -30031,8 +30029,8 @@ These files are preserved. 保存会话时发生错误 - Could not save session to file %1 - 无法将会话保存到文件 %1 + Could not save session to file "%1" + 无法将会话保存到文件 "%1" Untitled diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 7f39bb619d1..7e1ff707a67 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -7218,8 +7218,8 @@ to version control (%2)? 儲存工作階段時發生錯誤 - Could not save session to file %1 - 無法儲存工作階段至檔案 %1 + Could not save session to file "%1" + 無法儲存工作階段至檔案 "%1" Untitled diff --git a/src/libs/advanceddockingsystem/workspaceview.cpp b/src/libs/advanceddockingsystem/workspaceview.cpp index bab54e5e927..1b4cfc7e270 100644 --- a/src/libs/advanceddockingsystem/workspaceview.cpp +++ b/src/libs/advanceddockingsystem/workspaceview.cpp @@ -325,10 +325,10 @@ bool WorkspaceView::confirmWorkspaceDelete(const QStringList &fileNames) { const QString title = fileNames.size() == 1 ? Tr::tr("Delete Workspace") : Tr::tr("Delete Workspaces"); - const QString question - = fileNames.size() == 1 - ? Tr::tr("Delete workspace %1?").arg(fileNames.first()) - : Tr::tr("Delete these workspaces?\n %1").arg(fileNames.join("\n ")); + const QString question = fileNames.size() == 1 + ? Tr::tr("Delete workspace \"%1\"?").arg(fileNames.first()) + : Tr::tr("Delete these workspaces?") + + QString("\n %1").arg(fileNames.join("\n ")); return QMessageBox::question(parentWidget(), title, question, QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes; } diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp index a29c5bb9be6..ef6640d8a21 100644 --- a/src/libs/utils/devicefileaccess.cpp +++ b/src/libs/utils/devicefileaccess.cpp @@ -197,15 +197,15 @@ expected_str DeviceFileAccess::copyRecursively(const FilePath &src, const FilePath &target) const { if (!src.isDir()) { - return make_unexpected(Tr::tr("Cannot copy from %1, it is not a directory.") - .arg(src.toUserOutput()) - .arg(target.toUserOutput())); + return make_unexpected( + Tr::tr("Cannot copy from \"%1\", it is not a directory.").arg(src.toUserOutput())); } if (!target.ensureWritableDir()) { - return make_unexpected(Tr::tr("Cannot copy %1 to %2, it is not a writable directory.") - .arg(src.toUserOutput()) - .arg(target.toUserOutput())); + return make_unexpected( + Tr::tr("Cannot copy \"%1\" to \"%2\", it is not a writable directory.") + .arg(src.toUserOutput()) + .arg(target.toUserOutput())); } #ifdef UTILS_STATIC_LIBRARY diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 610fd86ec29..78b6449a7a9 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -238,7 +238,7 @@ void CMakeProject::readPresets() if (includeStack.contains(includePath)) { TaskHub::addTask(BuildSystemTask( Task::TaskType::Warning, - Tr::tr("Attempt to include %1 which was already parsed.") + Tr::tr("Attempt to include \"%1\" which was already parsed.") .arg(includePath.path()), Utils::FilePath(), -1)); diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp index af6c11825d4..d5450259809 100644 --- a/src/plugins/coreplugin/patchtool.cpp +++ b/src/plugins/coreplugin/patchtool.cpp @@ -93,7 +93,8 @@ static bool runPatchHelper(const QByteArray &input, const FilePath &workingDirec if (patchAction == PatchAction::Revert) args << "-R"; args << "--binary"; - MessageManager::writeDisrupting(Tr::tr("Running in %1: %2 %3") + MessageManager::writeDisrupting( + Tr::tr("Running in \"%1\": %2 %3") .arg(workingDirectory.toUserOutput(), patch.toUserOutput(), args.join(' '))); patchProcess.setCommand({patch, args}); patchProcess.setWriteData(input); diff --git a/src/plugins/coreplugin/session.cpp b/src/plugins/coreplugin/session.cpp index d6ccc4ca716..50873c385c6 100644 --- a/src/plugins/coreplugin/session.cpp +++ b/src/plugins/coreplugin/session.cpp @@ -720,7 +720,7 @@ bool SessionManager::saveSession() } else { QMessageBox::warning(ICore::dialogParent(), PE::Tr::tr("Error while saving session"), - PE::Tr::tr("Could not save session to file %1") + PE::Tr::tr("Could not save session to file \"%1\"") .arg(sb_d->m_writer->fileName().toUserOutput())); } diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp index 96f97feea3b..edc65f76526 100644 --- a/src/plugins/cppeditor/cppeditorwidget.cpp +++ b/src/plugins/cppeditor/cppeditorwidget.cpp @@ -780,11 +780,11 @@ void CppEditorWidget::showRenameWarningIfFileIsGenerated(const Utils::FilePath & static const Id infoId("cppeditor.renameWarning"); InfoBarEntry info(infoId, warning); if (ec) { - info.addCustomButton(CppEditor::Tr::tr("Open %1").arg(ec->source().fileName()), - [source = ec->source()] { - EditorManager::openEditor(source); - ICore::infoBar()->removeInfo(infoId); - }); + info.addCustomButton(CppEditor::Tr::tr("Open \"%1\"").arg(ec->source().fileName()), + [source = ec->source()] { + EditorManager::openEditor(source); + ICore::infoBar()->removeInfo(infoId); + }); } ICore::infoBar()->addInfo(info); return; diff --git a/src/plugins/python/pythonsettings.cpp b/src/plugins/python/pythonsettings.cpp index 0a6abe2e043..1de24a3061c 100644 --- a/src/plugins/python/pythonsettings.cpp +++ b/src/plugins/python/pythonsettings.cpp @@ -171,9 +171,10 @@ InterpreterOptionsWidget::InterpreterOptionsWidget() if (interpreter.command.isEmpty()) return Tr::tr("Executable is empty."); if (!interpreter.command.exists()) - return Tr::tr("%1 does not exist.").arg(interpreter.command.toUserOutput()); + return Tr::tr("\"%1\" does not exist.").arg(interpreter.command.toUserOutput()); if (!interpreter.command.isExecutableFile()) - return Tr::tr("%1 is not an executable file.").arg(interpreter.command.toUserOutput()); + return Tr::tr("\"%1\" is not an executable file.") + .arg(interpreter.command.toUserOutput()); break; case Qt::DecorationRole: if (column == 0 && !interpreter.command.isExecutableFile()) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 2b73c154f6d..c4c76017d44 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -1604,8 +1604,8 @@ void QmakeBuildSystem::runGenerator(Utils::Id id) proc->setWorkingDirectory(outDir); proc->setEnvironment(buildConfiguration()->environment()); proc->setCommand(cmdLine); - Core::MessageManager::writeFlashing(Tr::tr("Running in %1: %2") - .arg(outDir.toUserOutput(), cmdLine.toUserOutput())); + Core::MessageManager::writeFlashing( + Tr::tr("Running in \"%1\": %2").arg(outDir.toUserOutput(), cmdLine.toUserOutput())); proc->start(); } diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp index 2b5536809f8..4908e90498c 100644 --- a/src/plugins/vcsbase/vcsoutputwindow.cpp +++ b/src/plugins/vcsbase/vcsoutputwindow.cpp @@ -444,7 +444,7 @@ QString VcsOutputWindow::msgExecutionLogEntry(const FilePath &workingDir, const + ' ' + formatArguments(command.splitArguments()); if (workingDir.isEmpty()) return Tr::tr("Running: %1").arg(maskedCmdline) + '\n'; - return Tr::tr("Running in %1: %2").arg(workingDir.toUserOutput(), maskedCmdline) + '\n'; + return Tr::tr("Running in \"%1\": %2").arg(workingDir.toUserOutput(), maskedCmdline) + '\n'; } void VcsOutputWindow::appendShellCommandLine(const QString &text)