From c2a0eee029339c8b9e9f3b547dbd8d6fc8984daa Mon Sep 17 00:00:00 2001 From: John Veness Date: Sun, 17 Sep 2023 19:33:31 +0100 Subject: [PATCH] Change Directory to Folder in user-facing strings --- README.md | 20 ++++++------- cli/application.cpp | 28 ++++++++--------- cli/args.cpp | 14 ++++----- fileitemactionplugin/syncthingdiractions.cpp | 2 +- .../syncthingfileitemaction.cpp | 12 ++++---- .../syncthingfileitemaction_cs_CZ.ts | 14 ++++----- .../syncthingfileitemaction_de_DE.ts | 14 ++++----- .../syncthingfileitemaction_en_US.ts | 14 ++++----- .../syncthingfileitemaction_zh_CN.ts | 14 ++++----- plasmoid/lib/appearanceoptionpage.ui | 2 +- .../contents/ui/FullRepresentation.qml | 2 +- .../contents/ui/RecentChangesPage.qml | 2 +- plasmoid/package5/contents/ui/ToolBar.qml | 2 +- plasmoid/package5/contents/ui/main.qml | 2 +- .../contents/ui/FullRepresentation.qml | 2 +- .../contents/ui/RecentChangesPage.qml | 2 +- plasmoid/package6/contents/ui/ToolBar.qml | 2 +- plasmoid/package6/contents/ui/main.qml | 2 +- .../translations/syncthingplasmoid_cs_CZ.ts | 4 +-- .../translations/syncthingplasmoid_de_DE.ts | 12 ++++---- .../translations/syncthingplasmoid_en_US.ts | 12 ++++---- .../translations/syncthingplasmoid_zh_CN.ts | 6 ++-- syncthingconnector/syncthingconnection.cpp | 2 +- .../syncthingconnection_requests.cpp | 22 +++++++------- syncthingconnector/syncthingnotifier.cpp | 4 +-- .../translations/syncthingconnector_cs_CZ.ts | 30 +++++++++---------- .../translations/syncthingconnector_de_DE.ts | 30 +++++++++---------- .../translations/syncthingconnector_en_US.ts | 30 +++++++++---------- .../translations/syncthingconnector_zh_CN.ts | 30 +++++++++---------- syncthingconnector/utils.cpp | 6 ++-- .../syncthingrecentchangesmodel.cpp | 2 +- .../translations/syncthingmodel_cs_CZ.ts | 2 +- .../translations/syncthingmodel_de_DE.ts | 2 +- .../translations/syncthingmodel_en_US.ts | 2 +- .../translations/syncthingmodel_zh_CN.ts | 2 +- syncthingwidgets/misc/dbusstatusnotifier.cpp | 2 +- syncthingwidgets/misc/direrrorsdialog.cpp | 2 +- syncthingwidgets/misc/statusinfo.cpp | 6 ++-- .../settings/notificationsoptionpage.ui | 6 ++-- .../translations/syncthingwidgets_cs_CZ.ts | 14 ++++----- .../translations/syncthingwidgets_de_DE.ts | 14 ++++----- .../translations/syncthingwidgets_en_US.ts | 14 ++++----- .../translations/syncthingwidgets_zh_CN.ts | 14 ++++----- tray/gui/trayicon.cpp | 2 +- tray/gui/traywidget.cpp | 8 ++--- tray/gui/traywidget.ui | 2 +- tray/translations/syncthingtray_cs_CZ.ts | 12 ++++---- tray/translations/syncthingtray_de_DE.ts | 12 ++++---- tray/translations/syncthingtray_en_US.ts | 12 ++++---- tray/translations/syncthingtray_zh_CN.ts | 12 ++++---- 50 files changed, 240 insertions(+), 240 deletions(-) diff --git a/README.md b/README.md index b9b8389..28ea9cb 100644 --- a/README.md +++ b/README.md @@ -50,16 +50,16 @@ certain caveats. ## Features * Provides quick access to most frequently used features but does not intend to replace the official web-based UI - * Check state of directories and devices + * Check state of folders and devices * Check current traffic statistics - * Display further details about directories and devices, like last file, last + * Display further details about folders and devices, like last file, last scan, items out of sync, ... * Display ongoing downloads * Display Syncthing log - * Trigger re-scan of a specific directory or all directories at once - * Open a directory with the default file browser + * Trigger re-scan of a specific folder or all folders at once + * Open a folder with the default file browser * Pause/resume a specific device or all devices at once - * Pause/resume a specific directory + * Pause/resume a specific folder * View recent history of changes (done locally and remotely) * Shows "desktop" notifications * The events to show notifications for can be configured @@ -79,12 +79,12 @@ certain caveats. * Trigger rescan/pause/resume/restart * Wait for idle * View and modify raw configuration - * Supports Bash completion, even for directory and device names -* Also bundles a KIO plugin which shows the status of a Syncthing directory and allows to trigger Syncthing actions + * Supports Bash completion, even for folder and device names +* Also bundles a KIO plugin which shows the status of a Syncthing folder and allows to trigger Syncthing actions in the Dolphin file manager * Rescan selected items - * Rescan entire Syncthing directory - * Pause/resume Syncthing directory + * Rescan entire Syncthing folder + * Pause/resume Syncthing folder * See also screenshots section * Allows building Syncthing as a library to run it in the same process as the tray/GUI * English and German localization @@ -499,7 +499,7 @@ It is possible to turn on logging of the underlying library by setting environme * `LIB_SYNCTHING_CONNECTOR_LOG_API_CALLS`: log calls to Syncthing's REST-API * `LIB_SYNCTHING_CONNECTOR_LOG_API_REPLIES`: log replies from Syncthing's REST-API (except events) * `LIB_SYNCTHING_CONNECTOR_LOG_EVENTS`: log events emitted by Syncthing's events REST-API endpoint -* `LIB_SYNCTHING_CONNECTOR_LOG_DIRS_OR_DEVS_RESETTED`: log when directories/devices are internally reset +* `LIB_SYNCTHING_CONNECTOR_LOG_DIRS_OR_DEVS_RESETTED`: log when folders/devices are internally reset ### Useful environment variables for development * `QT_QPA_PLATFORM`: set to `offscreen` to disable graphical output, e.g. to run tests in headless diff --git a/cli/application.cpp b/cli/application.cpp index 62a68f0..d685526 100644 --- a/cli/application.cpp +++ b/cli/application.cpp @@ -364,7 +364,7 @@ void Application::requestRescan(const ArgumentOccurrence &occurrence) ++m_expectedResponse; } if (!m_expectedResponse) { - cerr << Phrases::Error << "No (valid) directories specified." << Phrases::End << flush; + cerr << Phrases::Error << "No (valid) folders specified." << Phrases::End << flush; exit(1); } cerr << flush; @@ -374,7 +374,7 @@ void Application::requestRescanAll(const ArgumentOccurrence &) { m_expectedResponse = m_connection.dirInfo().size(); connect(&m_connection, &SyncthingConnection::rescanTriggered, this, &Application::handleResponse); - cerr << "Request rescanning all directories ..." << endl; + cerr << "Request rescanning all folders ..." << endl; m_connection.rescanAllDirs(); } @@ -390,7 +390,7 @@ void Application::requestPauseResume(bool pause) connect(&m_connection, &SyncthingConnection::directoryResumeTriggered, this, &Application::handleResponse); } if (m_relevantDirs.empty() && m_relevantDevs.empty()) { - cerr << Phrases::Error << "No directories or devices specified." << Phrases::End << flush; + cerr << Phrases::Error << "No folders or devices specified." << Phrases::End << flush; exit(1); } if (!m_relevantDirs.empty()) { @@ -400,9 +400,9 @@ void Application::requestPauseResume(bool pause) dirIds << dir.dirObj->id; } if (pause) { - cerr << "Request pausing directories "; + cerr << "Request pausing folders "; } else { - cerr << "Request resuming directories "; + cerr << "Request resuming folders "; } cerr << dirIds.join(QStringLiteral(", ")).toLocal8Bit().data() << " ...\n"; if (pause ? m_connection.pauseDirectories(dirIds) : m_connection.resumeDirectories(dirIds)) { @@ -426,7 +426,7 @@ void Application::requestPauseResume(bool pause) } } if (!m_expectedResponse) { - cerr << Phrases::Warning << "No directories or devices altered." << Phrases::End << flush; + cerr << Phrases::Warning << "No folders or devices altered." << Phrases::End << flush; exit(0); } cerr << flush; @@ -502,7 +502,7 @@ bool Application::findPwd() } // handle error - cerr << Phrases::Error << "The current working directory \"" << pwd.toLocal8Bit().data() << "\" is not (part of) a Syncthing directory."; + cerr << Phrases::Error << "The current working directory \"" << pwd.toLocal8Bit().data() << "\" is not (part of) a Syncthing folder."; cerr << Phrases::End << flush; QCoreApplication::exit(2); return false; @@ -635,7 +635,7 @@ void Application::printStatus(const ArgumentOccurrence &) // display dirs if (!m_relevantDirs.empty()) { - cout << TextAttribute::Bold << "Directories\n" << TextAttribute::Reset; + cout << TextAttribute::Bold << "Folders\n" << TextAttribute::Reset; std::sort(m_relevantDirs.begin(), m_relevantDirs.end(), [](const RelevantDir &lhs, const RelevantDir &rhs) { return lhs.dirObj->displayName() < rhs.dirObj->displayName(); }); std::for_each(m_relevantDirs.cbegin(), m_relevantDirs.cend(), bind(&Application::printDir, this, std::placeholders::_1)); @@ -1056,12 +1056,12 @@ void Application::requestPausePwd(const ArgumentOccurrence &) return; } if (m_connection.pauseDirectories(QStringList(m_pwd.dirObj->id))) { - cerr << "Request pausing directory \"" << m_pwd.dirObj->path.toLocal8Bit().data() << "\" ..." << endl; + cerr << "Request pausing folder \"" << m_pwd.dirObj->path.toLocal8Bit().data() << "\" ..." << endl; connect(&m_connection, &SyncthingConnection::directoryPauseTriggered, this, &Application::handleResponse); m_preventDisconnect = true; m_expectedResponse = 1; } else { - cerr << "Directory \"" << m_pwd.dirObj->path.toLocal8Bit().data() << " already paused" << endl; + cerr << "Folder \"" << m_pwd.dirObj->path.toLocal8Bit().data() << " already paused" << endl; QCoreApplication::quit(); } } @@ -1072,13 +1072,13 @@ void Application::requestResumePwd(const ArgumentOccurrence &) return; } if (m_connection.resumeDirectories(QStringList(m_pwd.dirObj->id))) { - cerr << "Request resuming directory \"" << m_pwd.dirObj->path.toLocal8Bit().data() << "\" ..." << endl; + cerr << "Request resuming folder \"" << m_pwd.dirObj->path.toLocal8Bit().data() << "\" ..." << endl; connect(&m_connection, &SyncthingConnection::directoryResumeTriggered, this, &Application::handleResponse); m_preventDisconnect = true; m_expectedResponse = 1; return; } else { - cerr << "Directory \"" << m_pwd.dirObj->path.toLocal8Bit().data() << " not paused" << endl; + cerr << "Folder \"" << m_pwd.dirObj->path.toLocal8Bit().data() << " not paused" << endl; QCoreApplication::quit(); } } @@ -1149,7 +1149,7 @@ RelevantDir Application::findDirectory(const QString &dirIdentifier) return relevantDir; } - cerr << Phrases::Warning << "Specified directory \"" << dirIdentifier.toLocal8Bit().data() << "\" is no Syncthing directory (or not part of any)." + cerr << Phrases::Warning << "Specified folder \"" << dirIdentifier.toLocal8Bit().data() << "\" is no Syncthing folder (or not part of any)." << Phrases::End; return relevantDir; } @@ -1158,7 +1158,7 @@ void RelevantDir::notifyAboutRescan() const { cerr << Phrases::Info; if (subDir.isEmpty()) { - cerr << "Request rescanning directory \"" << dirObj->path.toLocal8Bit().data() << "\" ..."; + cerr << "Request rescanning folder \"" << dirObj->path.toLocal8Bit().data() << "\" ..."; } else { cerr << "Request rescanning item \"" << subDir.toLocal8Bit().data() << "\" in directory \"" << dirObj->path.toLocal8Bit().data() << "\" ..."; } diff --git a/cli/args.cpp b/cli/args.cpp index e215d87..3c18b92 100644 --- a/cli/args.cpp +++ b/cli/args.cpp @@ -5,14 +5,14 @@ namespace Cli { Args::Args() - : status("status", 's', "shows the overall status and/or directory/device specific status") + : status("status", 's', "shows the overall status and/or folder/device specific status") , log("log", 'l', "shows the Syncthing log") , stop("stop", '\0', "stops Syncthing") , restart("restart", '\0', "restarts Syncthing") - , rescan("rescan", 'r', "rescans the specified directories") - , rescanAll("rescan-all", '\0', "rescans all directories") - , pause("pause", '\0', "pauses the specified directories and devices") - , resume("resume", '\0', "resumes the specified directories and devices") + , rescan("rescan", 'r', "rescans the specified folders") + , rescanAll("rescan-all", '\0', "rescans all folders") + , pause("pause", '\0', "pauses the specified folders and devices") + , resume("resume", '\0', "resumes the specified folders and devices") , waitForIdle("wait-for-idle", 'w', "waits until the specified dirs/devs are idling") , pwd("pwd", 'p', "operates in the current working directory") , cat("cat", '\0', "prints the current Syncthing configuration") @@ -25,9 +25,9 @@ Args::Args() , jsLines("js-lines", '\0', "runs the specified ECMAScript lines on the configuration rather than opening an editor", { "line" }) , dryRun("dry-run", '\0', "writes the altered configuration to stdout instead of posting it to Syncthing") , stats("stats", '\0', "shows overall statistics") - , dir("dir", 'd', "specifies a directory by ID", { "ID" }) + , dir("dir", 'd', "specifies a folder by ID", { "ID" }) , dev("dev", '\0', "specifies a device by ID or name", { "ID/name" }) - , allDirs("all-dirs", '\0', "applies the operation for all directories") + , allDirs("all-dirs", '\0', "applies the operation for all folders") , allDevs("all-devs", '\0', "applies the operation for all devices") , atLeast("at-least", 'a', "specifies for how many milliseconds Syncthing must idle (prevents exiting too early in case of flaky status)", { "number" }) diff --git a/fileitemactionplugin/syncthingdiractions.cpp b/fileitemactionplugin/syncthingdiractions.cpp index 9701499..3e6f124 100644 --- a/fileitemactionplugin/syncthingdiractions.cpp +++ b/fileitemactionplugin/syncthingdiractions.cpp @@ -40,7 +40,7 @@ bool SyncthingDirActions::updateStatus(const SyncthingDir &dir) if (dir.id != m_dirId) { return false; } - m_infoAction.setText(tr("Directory info for %1").arg(dir.displayName())); + m_infoAction.setText(tr("Folder info for %1").arg(dir.displayName())); m_statusAction.setText(tr("Status: ") + dir.statusString()); if (dir.paused && dir.status != SyncthingDirStatus::OutOfSync) { m_statusAction.setIcon(statusIcons().pause); diff --git a/fileitemactionplugin/syncthingfileitemaction.cpp b/fileitemactionplugin/syncthingfileitemaction.cpp index 5708e5b..84eb24c 100644 --- a/fileitemactionplugin/syncthingfileitemaction.cpp +++ b/fileitemactionplugin/syncthingfileitemaction.cpp @@ -171,7 +171,7 @@ QList SyncthingFileItemAction::createActions(const KFileItemListPrope // rescan item actions << new QAction(QIcon::fromTheme(QStringLiteral("folder-sync")), - detectedDirs.size() == 1 ? tr("Rescan \"%1\"").arg(detectedDirs.front()->displayName()) : tr("Rescan selected directories"), parent); + detectedDirs.size() == 1 ? tr("Rescan \"%1\"").arg(detectedDirs.front()->displayName()) : tr("Rescan selected folders"), parent); if (connection.isConnected() && !detectedDirsStats.allPaused) { for (const SyncthingDir *dir : std::as_const(detectedDirs)) { connect(actions.back(), &QAction::triggered, bind(&SyncthingFileItemActionStaticData::rescanDir, &data, dir->id, QString())); @@ -184,10 +184,10 @@ QList SyncthingFileItemAction::createActions(const KFileItemListPrope // pause/resume item if (detectedDirsStats.anyPaused) { actions << new QAction(QIcon::fromTheme(QStringLiteral("media-playback-start")), - detectedDirs.size() == 1 ? tr("Resume \"%1\"").arg(detectedDirs.front()->displayName()) : tr("Resume selected directories"), parent); + detectedDirs.size() == 1 ? tr("Resume \"%1\"").arg(detectedDirs.front()->displayName()) : tr("Resume selected folders"), parent); } else { actions << new QAction(QIcon::fromTheme(QStringLiteral("media-playback-pause")), - detectedDirs.size() == 1 ? tr("Pause \"%1\"").arg(detectedDirs.front()->displayName()) : tr("Pause selected directories"), parent); + detectedDirs.size() == 1 ? tr("Pause \"%1\"").arg(detectedDirs.front()->displayName()) : tr("Pause selected folders"), parent); } if (connection.isConnected()) { connect(actions.back(), &QAction::triggered, @@ -202,7 +202,7 @@ QList SyncthingFileItemAction::createActions(const KFileItemListPrope if (!containingDirs.isEmpty()) { // rescan item actions << new QAction(QIcon::fromTheme(QStringLiteral("folder-sync")), - containingDirs.size() == 1 ? tr("Rescan \"%1\"").arg(containingDirs.front()->displayName()) : tr("Rescan containing directories"), + containingDirs.size() == 1 ? tr("Rescan \"%1\"").arg(containingDirs.front()->displayName()) : tr("Rescan containing folders"), parent); if (connection.isConnected() && !containingDirsStats.allPaused) { for (const SyncthingDir *dir : std::as_const(containingDirs)) { @@ -215,11 +215,11 @@ QList SyncthingFileItemAction::createActions(const KFileItemListPrope // pause/resume item if (containingDirsStats.anyPaused) { actions << new QAction(QIcon::fromTheme(QStringLiteral("media-playback-start")), - containingDirs.size() == 1 ? tr("Resume \"%1\"").arg(containingDirs.front()->displayName()) : tr("Resume containing directories"), + containingDirs.size() == 1 ? tr("Resume \"%1\"").arg(containingDirs.front()->displayName()) : tr("Resume containing folders"), parent); } else { actions << new QAction(QIcon::fromTheme(QStringLiteral("media-playback-pause")), - containingDirs.size() == 1 ? tr("Pause \"%1\"").arg(containingDirs.front()->displayName()) : tr("Pause containing directories"), + containingDirs.size() == 1 ? tr("Pause \"%1\"").arg(containingDirs.front()->displayName()) : tr("Pause containing folders"), parent); } if (connection.isConnected()) { diff --git a/fileitemactionplugin/translations/syncthingfileitemaction_cs_CZ.ts b/fileitemactionplugin/translations/syncthingfileitemaction_cs_CZ.ts index 9ace3d2..c5ee2a5 100644 --- a/fileitemactionplugin/translations/syncthingfileitemaction_cs_CZ.ts +++ b/fileitemactionplugin/translations/syncthingfileitemaction_cs_CZ.ts @@ -10,7 +10,7 @@ - Directory info for %1 + Folder info for %1 Informace o adresáři pro %1 @@ -56,12 +56,12 @@ - Rescan selected directories + Rescan selected folders Znovu prohledat označené adresáře - Resume selected directories + Resume selected folders Pokračovat označené adresáře @@ -73,17 +73,17 @@ - Pause selected directories + Pause selected folders Pozastavit označené adresáře - Rescan containing directories + Rescan containing folders Znovu prohledat obsažené adresáře - Resume containing directories + Resume containing folders Pokračovat obsažené adresáře @@ -94,7 +94,7 @@ - Pause containing directories + Pause containing folders Pozastavit obsažené adresáře diff --git a/fileitemactionplugin/translations/syncthingfileitemaction_de_DE.ts b/fileitemactionplugin/translations/syncthingfileitemaction_de_DE.ts index d69ea3a..ca97d62 100644 --- a/fileitemactionplugin/translations/syncthingfileitemaction_de_DE.ts +++ b/fileitemactionplugin/translations/syncthingfileitemaction_de_DE.ts @@ -10,7 +10,7 @@ - Directory info for %1 + Folder info for %1 Verzeichnisinfo für %1 @@ -56,12 +56,12 @@ - Rescan selected directories + Rescan selected folders Ausgewählte Verzeichnisse neu scannen - Resume selected directories + Resume selected folders Ausgewählte verzeichnisse fortsetzen @@ -73,17 +73,17 @@ - Pause selected directories + Pause selected folders Ausgewählte Verzeichnisse pausieren - Rescan containing directories + Rescan containing folders Beinhaltendes Verzeichnis neu scannen - Resume containing directories + Resume containing folders Beinhaltendes Verzeichnis fortsetzen @@ -99,7 +99,7 @@ - Pause containing directories + Pause containing folders Beinhaltendes Verzeichnis pausieren diff --git a/fileitemactionplugin/translations/syncthingfileitemaction_en_US.ts b/fileitemactionplugin/translations/syncthingfileitemaction_en_US.ts index da6fe6f..45c403c 100644 --- a/fileitemactionplugin/translations/syncthingfileitemaction_en_US.ts +++ b/fileitemactionplugin/translations/syncthingfileitemaction_en_US.ts @@ -10,7 +10,7 @@ - Directory info for %1 + Folder info for %1 @@ -61,7 +61,7 @@ - Rescan selected directories + Rescan selected folders @@ -73,22 +73,22 @@ - Resume selected directories + Resume selected folders - Pause selected directories + Pause selected folders - Rescan containing directories + Rescan containing folders - Resume containing directories + Resume containing folders @@ -99,7 +99,7 @@ - Pause containing directories + Pause containing folders diff --git a/fileitemactionplugin/translations/syncthingfileitemaction_zh_CN.ts b/fileitemactionplugin/translations/syncthingfileitemaction_zh_CN.ts index 26bb318..24a0e1a 100644 --- a/fileitemactionplugin/translations/syncthingfileitemaction_zh_CN.ts +++ b/fileitemactionplugin/translations/syncthingfileitemaction_zh_CN.ts @@ -10,7 +10,7 @@ - Directory info for %1 + Folder info for %1 %1 的目录信息 @@ -62,7 +62,7 @@ - Rescan selected directories + Rescan selected folders 重新扫描选定的目录 @@ -73,7 +73,7 @@ - Resume selected directories + Resume selected folders 恢复选定的目录 @@ -84,22 +84,22 @@ - Pause selected directories + Pause selected folders 暂停选定的目录 - Rescan containing directories + Rescan containing folders 重新扫描包含的目录 - Resume containing directories + Resume containing folders 恢复包含的目录 - Pause containing directories + Pause containing folders 暂停包含的目录 diff --git a/plasmoid/lib/appearanceoptionpage.ui b/plasmoid/lib/appearanceoptionpage.ui index f664c87..127f4a1 100644 --- a/plasmoid/lib/appearanceoptionpage.ui +++ b/plasmoid/lib/appearanceoptionpage.ui @@ -22,7 +22,7 @@ - Size of directory/device/download list + Size of folder/device/download list true diff --git a/plasmoid/package5/contents/ui/FullRepresentation.qml b/plasmoid/package5/contents/ui/FullRepresentation.qml index c1b8846..d6e991a 100644 --- a/plasmoid/package5/contents/ui/FullRepresentation.qml +++ b/plasmoid/package5/contents/ui/FullRepresentation.qml @@ -30,7 +30,7 @@ PlasmaExtras.Representation { Layout.fillHeight: true TabButton { id: dirsTabButton - text: qsTr("Directories") + text: qsTr("Folders") icon.source: plasmoid.nativeInterface.faUrl + "folder" width: tabBar.buttonWidth } diff --git a/plasmoid/package5/contents/ui/RecentChangesPage.qml b/plasmoid/package5/contents/ui/RecentChangesPage.qml index 48d9336..3372498 100644 --- a/plasmoid/package5/contents/ui/RecentChangesPage.qml +++ b/plasmoid/package5/contents/ui/RecentChangesPage.qml @@ -116,7 +116,7 @@ Item { onClicked: recentChangesView.currentItem.copyDeviceId() } PlasmaComponents.MenuItem { - text: qsTr("Copy directory ID") + text: qsTr("Copy folder ID") icon: "folder" onClicked: recentChangesView.currentItem.copyFolderId() } diff --git a/plasmoid/package5/contents/ui/ToolBar.qml b/plasmoid/package5/contents/ui/ToolBar.qml index 3be8800..1f53284 100644 --- a/plasmoid/package5/contents/ui/ToolBar.qml +++ b/plasmoid/package5/contents/ui/ToolBar.qml @@ -227,7 +227,7 @@ RowLayout { icon.source: plasmoid.nativeInterface.faUrl + "refresh" onClicked: plasmoid.nativeInterface.connection.rescanAllDirs() PlasmaComponents3.ToolTip { - text: qsTr("Rescan all directories") + text: qsTr("Rescan all folders") } Shortcut { sequence: "Ctrl+Shift+R" diff --git a/plasmoid/package5/contents/ui/main.qml b/plasmoid/package5/contents/ui/main.qml index d0da6a2..9e57f89 100644 --- a/plasmoid/package5/contents/ui/main.qml +++ b/plasmoid/package5/contents/ui/main.qml @@ -58,7 +58,7 @@ Item { plasmoid.removeAction("configure") plasmoid.setAction("showWebUI", qsTr("Open Syncthing"), "syncthing") plasmoid.setAction("configure", qsTr("Settings"), "configure") - plasmoid.setAction("rescanAllDirs", qsTr("Rescan all directories"), + plasmoid.setAction("rescanAllDirs", qsTr("Rescan all folders"), "folder-sync") plasmoid.setAction("showOwnId", qsTr("Show own device ID"), "view-barcode-qr") diff --git a/plasmoid/package6/contents/ui/FullRepresentation.qml b/plasmoid/package6/contents/ui/FullRepresentation.qml index 900074d..b02b576 100644 --- a/plasmoid/package6/contents/ui/FullRepresentation.qml +++ b/plasmoid/package6/contents/ui/FullRepresentation.qml @@ -31,7 +31,7 @@ PlasmaExtras.Representation { Layout.fillHeight: true TabButton { id: dirsTabButton - text: qsTr("Directories") + text: qsTr("Folders") icon.source: plasmoid.faUrl + "folder" width: tabBar.buttonWidth } diff --git a/plasmoid/package6/contents/ui/RecentChangesPage.qml b/plasmoid/package6/contents/ui/RecentChangesPage.qml index b421d85..75360d5 100644 --- a/plasmoid/package6/contents/ui/RecentChangesPage.qml +++ b/plasmoid/package6/contents/ui/RecentChangesPage.qml @@ -117,7 +117,7 @@ Item { onClicked: recentChangesView.currentItem.copyDeviceId() } PlasmaExtras.MenuItem { - text: qsTr("Copy directory ID") + text: qsTr("Copy folder ID") icon: "folder" onClicked: recentChangesView.currentItem.copyFolderId() } diff --git a/plasmoid/package6/contents/ui/ToolBar.qml b/plasmoid/package6/contents/ui/ToolBar.qml index 384ac70..21d8ea3 100644 --- a/plasmoid/package6/contents/ui/ToolBar.qml +++ b/plasmoid/package6/contents/ui/ToolBar.qml @@ -226,7 +226,7 @@ RowLayout { icon.source: plasmoid.faUrl + "refresh" onClicked: plasmoid.connection.rescanAllDirs() PlasmaComponents3.ToolTip { - text: qsTr("Rescan all directories") + text: qsTr("Rescan all folders") } Shortcut { sequence: "Ctrl+Shift+R" diff --git a/plasmoid/package6/contents/ui/main.qml b/plasmoid/package6/contents/ui/main.qml index 2b77427..1aebb98 100644 --- a/plasmoid/package6/contents/ui/main.qml +++ b/plasmoid/package6/contents/ui/main.qml @@ -31,7 +31,7 @@ PlasmoidItem { onTriggered: Plasmoid.showWebUI() }, PlasmaCore.Action { - text: qsTr("Rescan all directories") + text: qsTr("Rescan all folders") icon.name: "folder-sync" onTriggered: Plasmoid.connection.rescanAllDirs() }, diff --git a/plasmoid/translations/syncthingplasmoid_cs_CZ.ts b/plasmoid/translations/syncthingplasmoid_cs_CZ.ts index 83de1a3..0249a3f 100644 --- a/plasmoid/translations/syncthingplasmoid_cs_CZ.ts +++ b/plasmoid/translations/syncthingplasmoid_cs_CZ.ts @@ -108,7 +108,7 @@ - Rescan all directories + Rescan all folders Znovu proskenovat všechny adresáře @@ -294,7 +294,7 @@ - Rescan all directories + Rescan all folders Znovu proskenovat všechny adresáře diff --git a/plasmoid/translations/syncthingplasmoid_de_DE.ts b/plasmoid/translations/syncthingplasmoid_de_DE.ts index 32d556f..c993b40 100644 --- a/plasmoid/translations/syncthingplasmoid_de_DE.ts +++ b/plasmoid/translations/syncthingplasmoid_de_DE.ts @@ -150,7 +150,7 @@ Syncthing-Log anzeigen - Rescan all directories + Rescan all folders Alle Verzeichnisse neu scannen @@ -188,7 +188,7 @@ - Directories + Folders Verzeichnisse @@ -230,7 +230,7 @@ - Size of directory/device/download list + Size of folder/device/download list Größe der Verzeichnis-/Geräte-/Downloadliste @@ -375,7 +375,7 @@ - Copy directory ID + Copy folder ID Verzeichnis-ID kopieren @@ -465,7 +465,7 @@ - Rescan all directories + Rescan all folders Alle Verzeichnisse neu scannen @@ -520,7 +520,7 @@ - Rescan all directories + Rescan all folders Alle Verzeichnisse neu scannen diff --git a/plasmoid/translations/syncthingplasmoid_en_US.ts b/plasmoid/translations/syncthingplasmoid_en_US.ts index 559810e..71544fa 100644 --- a/plasmoid/translations/syncthingplasmoid_en_US.ts +++ b/plasmoid/translations/syncthingplasmoid_en_US.ts @@ -44,7 +44,7 @@ - Filter directories + Filter folders @@ -144,7 +144,7 @@ - Directories + Folders @@ -181,7 +181,7 @@ - Size of directory/device/download list + Size of folder/device/download list @@ -309,7 +309,7 @@ - Copy directory ID + Copy folder ID @@ -399,7 +399,7 @@ - Rescan all directories + Rescan all folders @@ -432,7 +432,7 @@ - Rescan all directories + Rescan all folders diff --git a/plasmoid/translations/syncthingplasmoid_zh_CN.ts b/plasmoid/translations/syncthingplasmoid_zh_CN.ts index d0a18c5..9d3f6b9 100644 --- a/plasmoid/translations/syncthingplasmoid_zh_CN.ts +++ b/plasmoid/translations/syncthingplasmoid_zh_CN.ts @@ -138,7 +138,7 @@ - Rescan all directories + Rescan all folders 重新扫描所有目录 @@ -186,7 +186,7 @@ - Size of directory/device/download list + Size of folder/device/download list 目录/设备/下载列表的大小 @@ -332,7 +332,7 @@ - Rescan all directories + Rescan all folders 重新扫描所有目录 diff --git a/syncthingconnector/syncthingconnection.cpp b/syncthingconnector/syncthingconnection.cpp index 66bcd06..74d7054 100644 --- a/syncthingconnector/syncthingconnection.cpp +++ b/syncthingconnector/syncthingconnection.cpp @@ -208,7 +208,7 @@ void SyncthingConnection::setLoggingFlags(SyncthingConnectionLoggingFlags flags) && !(m_loggingFlagsHandler & SyncthingConnectionLoggingFlags::DirsOrDevsResetted)) { QObject::connect(this, &SyncthingConnection::newDirs, [this](const auto &dirs) { if (m_loggingFlags & SyncthingConnectionLoggingFlags::DirsOrDevsResetted) { - std::cerr << Phrases::Info << "Directory list renewed:" << Phrases::End; + std::cerr << Phrases::Info << "Folder list renewed:" << Phrases::End; std::cerr << displayNames(dirs).join(QStringLiteral(", ")).toStdString() << endl; } }); diff --git a/syncthingconnector/syncthingconnection_requests.cpp b/syncthingconnector/syncthingconnection_requests.cpp index 4ff963c..acec131 100644 --- a/syncthingconnector/syncthingconnection_requests.cpp +++ b/syncthingconnector/syncthingconnection_requests.cpp @@ -402,7 +402,7 @@ bool SyncthingConnection::pauseResumeDirectory(const QStringList &dirIds, bool p return false; } if (!isConnected()) { - emit error(tr("Unable to pause/resume a directories when not connected"), SyncthingErrorCategory::SpecificRequest, QNetworkReply::NoError); + emit error(tr("Unable to pause/resume a folders when not connected"), SyncthingErrorCategory::SpecificRequest, QNetworkReply::NoError); return false; } @@ -439,7 +439,7 @@ void SyncthingConnection::readDirPauseResume() break; } default: - emitError(tr("Unable to request directory pause/resume: "), SyncthingErrorCategory::SpecificRequest, reply); + emitError(tr("Unable to request folder pause/resume: "), SyncthingErrorCategory::SpecificRequest, reply); } } @@ -470,7 +470,7 @@ void SyncthingConnection::rescanAllDirs() void SyncthingConnection::rescan(const QString &dirId, const QString &relpath) { if (dirId.isEmpty()) { - emit error(tr("Unable to rescan: No directory ID specified."), SyncthingErrorCategory::SpecificRequest, QNetworkReply::NoError, + emit error(tr("Unable to rescan: No folder ID specified."), SyncthingErrorCategory::SpecificRequest, QNetworkReply::NoError, QNetworkRequest(), QByteArray()); return; } @@ -1013,7 +1013,7 @@ void SyncthingConnection::readDirStatistics() auto jsonError = QJsonParseError(); const auto replyDoc = QJsonDocument::fromJson(response, &jsonError); if (jsonError.error != QJsonParseError::NoError) { - emitError(tr("Unable to parse directory statistics: "), jsonError, reply, response); + emitError(tr("Unable to parse folder statistics: "), jsonError, reply, response); return; } @@ -1064,7 +1064,7 @@ void SyncthingConnection::readDirStatistics() handleAdditionalRequestCanceled(); return; default: - emitError(tr("Unable to request directory statistics: "), SyncthingErrorCategory::OverallConnection, reply); + emitError(tr("Unable to request folder statistics: "), SyncthingErrorCategory::OverallConnection, reply); } } @@ -1107,7 +1107,7 @@ void SyncthingConnection::readDirStatus() auto jsonError = QJsonParseError(); const auto replyDoc = QJsonDocument::fromJson(response, &jsonError); if (jsonError.error != QJsonParseError::NoError) { - emitError(tr("Unable to parse status for directory %1: ").arg(dirId), jsonError, reply, response); + emitError(tr("Unable to parse status for folder %1: ").arg(dirId), jsonError, reply, response); return; } @@ -1122,7 +1122,7 @@ void SyncthingConnection::readDirStatus() handleAdditionalRequestCanceled(); return; default: - emitError(tr("Unable to request directory statistics: "), SyncthingErrorCategory::SpecificRequest, reply); + emitError(tr("Unable to request folder statistics: "), SyncthingErrorCategory::SpecificRequest, reply); } } @@ -1170,7 +1170,7 @@ void SyncthingConnection::readDirPullErrors() auto jsonError = QJsonParseError(); const auto replyDoc = QJsonDocument::fromJson(response, &jsonError); if (jsonError.error != QJsonParseError::NoError) { - emitError(tr("Unable to parse pull errors for directory %1: ").arg(dirId), jsonError, reply, response); + emitError(tr("Unable to parse pull errors for folder %1: ").arg(dirId), jsonError, reply, response); return; } @@ -1180,7 +1180,7 @@ void SyncthingConnection::readDirPullErrors() case QNetworkReply::OperationCanceledError: return; default: - emitError(tr("Unable to request pull errors for directory %1: ").arg(dirId), SyncthingErrorCategory::SpecificRequest, reply); + emitError(tr("Unable to request pull errors for folder %1: ").arg(dirId), SyncthingErrorCategory::SpecificRequest, reply); } } @@ -1246,7 +1246,7 @@ void SyncthingConnection::readCompletion() return; } - emitError(tr("Unable to parse completion for device/directory %1/%2: ").arg(devId, dirId), jsonError, reply, response); + emitError(tr("Unable to parse completion for device/folder %1/%2: ").arg(devId, dirId), jsonError, reply, response); break; } case QNetworkReply::ContentNotFoundError: @@ -1261,7 +1261,7 @@ void SyncthingConnection::readCompletion() handleAdditionalRequestCanceled(); break; default: - emitError(tr("Unable to request completion for device/directory %1/%2: ").arg(devId, dirId), SyncthingErrorCategory::SpecificRequest, reply); + emitError(tr("Unable to request completion for device/folder %1/%2: ").arg(devId, dirId), SyncthingErrorCategory::SpecificRequest, reply); } ensureCompletionNotConsideredRequested(devId, devInfo, dirId, dirInfo); } diff --git a/syncthingconnector/syncthingnotifier.cpp b/syncthingconnector/syncthingnotifier.cpp index 1a1a741..2c0f767 100644 --- a/syncthingconnector/syncthingnotifier.cpp +++ b/syncthingconnector/syncthingnotifier.cpp @@ -88,9 +88,9 @@ void SyncthingNotifier::handleNewDirEvent(DateTime when, const QString &devId, c const auto message([&devId, dev, &dirId, &dirLabel] { const auto devPrefix(dev ? (tr("Device ") + dev->displayName()) : (tr("Unknown device ") + devId)); if (dirLabel.isEmpty()) { - return devPrefix + tr(" wants to share directory %1.").arg(dirId); + return devPrefix + tr(" wants to share folder %1.").arg(dirId); } else { - return devPrefix + tr(" wants to share directory %1 (%2).").arg(dirLabel, dirId); + return devPrefix + tr(" wants to share folder %1 (%2).").arg(dirLabel, dirId); } }()); emit newDir(devId, dirId, message); diff --git a/syncthingconnector/translations/syncthingconnector_cs_CZ.ts b/syncthingconnector/translations/syncthingconnector_cs_CZ.ts index 56e280f..caf7b2a 100644 --- a/syncthingconnector/translations/syncthingconnector_cs_CZ.ts +++ b/syncthingconnector/translations/syncthingconnector_cs_CZ.ts @@ -60,7 +60,7 @@ - Unable to rescan: No directory ID specified. + Unable to rescan: No folder ID specified. Nedaří se znovu prohledat: nezadán žádný identifikátor adresáře. @@ -70,7 +70,7 @@ - Unable to pause/resume a directories when not connected + Unable to pause/resume a folders when not connected Nedaří se pozastavit/pokračovat složky, když není spojeno @@ -130,13 +130,13 @@ - Unable to parse directory statistics: + Unable to parse folder statistics: Nedaří se zpracovat statistiky adresáře: - Unable to request directory statistics: + Unable to request folder statistics: Nedaří se vyžádat si statistiky adresáře: @@ -191,7 +191,7 @@ - Unable to request directory pause/resume: + Unable to request folder pause/resume: Nedaří se vyžádat si pozastavení/pokračování adresáře: @@ -206,27 +206,27 @@ - Unable to parse status for directory %1: + Unable to parse status for folder %1: Nedaří se zpracovat stav adresáře %1: - Unable to parse pull errors for directory %1: + Unable to parse pull errors for folder %1: Nedaří se zpracovat chyby příjmu pro adresář %1: - Unable to request pull errors for directory %1: + Unable to request pull errors for folder %1: Nedaří se vyžádat si chyby pro adresář %1: - Unable to parse completion for device/directory %1/%2: + Unable to parse completion for device/folder %1/%2: Nedaří se zpracovat stupeň dokončení pro zařízení/adresář %1/%2: - Unable to request completion for device/directory %1/%2: + Unable to request completion for device/folder %1/%2: Nedaří se vyžádat si stupeň dokončení pro zařízení/složku %1/%2: @@ -284,12 +284,12 @@ - wants to share directory %1. + wants to share folder %1. chce sdílet adresář %1. - wants to share directory %1 (%2). + wants to share folder %1 (%2). chce sdílet složku %1 (%2). @@ -382,12 +382,12 @@ - Synchronization of local directory %1 complete + Synchronization of local folder %1 complete Synchronizace místního adresáře %1 dokončena - Synchronization of the following local directories complete: + Synchronization of the following local folders complete: Synchronizace následujících místních adresářů dokončena: @@ -419,7 +419,7 @@ - Synchronization of the following directories on %1 complete: + Synchronization of the following folders on %1 complete: Synchronizace následujících adresářů na %1 dokončena: diff --git a/syncthingconnector/translations/syncthingconnector_de_DE.ts b/syncthingconnector/translations/syncthingconnector_de_DE.ts index 5fa2852..bb04d24 100644 --- a/syncthingconnector/translations/syncthingconnector_de_DE.ts +++ b/syncthingconnector/translations/syncthingconnector_de_DE.ts @@ -60,7 +60,7 @@ - Unable to rescan: No directory ID specified. + Unable to rescan: No folder ID specified. Fehler beim Anfordern eines Scans: keine Verzeichnis-ID angegeben. @@ -70,7 +70,7 @@ - Unable to pause/resume a directories when not connected + Unable to pause/resume a folders when not connected Fehler beim Anfordern Gerät zu Pausieren/Fortzusetzen @@ -130,13 +130,13 @@ - Unable to parse directory statistics: + Unable to parse folder statistics: Fehler beim Auslesen der Verzeichnisstatistiken: - Unable to request directory statistics: + Unable to request folder statistics: Fehler beim Abfragen der Verzeichnisstatistiken: @@ -191,7 +191,7 @@ - Unable to request directory pause/resume: + Unable to request folder pause/resume: Fehler beim Anfordern Verzeichnis zu Pausieren/Fortzusetzen: @@ -206,27 +206,27 @@ - Unable to parse status for directory %1: + Unable to parse status for folder %1: Fehler beim Auslesen des Status von Verzeichnis %1: - Unable to parse pull errors for directory %1: + Unable to parse pull errors for folder %1: Fehler beim Auslesen der Fehler von Verzeichnis %1: - Unable to request pull errors for directory %1: + Unable to request pull errors for folder %1: Fehler beim Anfordern der Fehler von Verzeichnis %1: - Unable to parse completion for device/directory %1/%2: + Unable to parse completion for device/folder %1/%2: Fehler beim Auslesen des Fortschrittes von Verzeichnis %1/%2: - Unable to request completion for device/directory %1/%2: + Unable to request completion for device/folder %1/%2: Fehler beim Anfordern des Fortschrittes von Verzeichnis %1/%2: @@ -284,12 +284,12 @@ - wants to share directory %1. + wants to share folder %1. möchte das Verzeichnis %1 teilen. - wants to share directory %1 (%2). + wants to share folder %1 (%2). möchte das Verzeichnis %1 (%2) teilen. @@ -380,12 +380,12 @@ - Synchronization of local directory %1 complete + Synchronization of local folder %1 complete %1 wurde lokal synchronisiert - Synchronization of the following local directories complete: + Synchronization of the following local folders complete: Folgende Verzeichnisse wurden lokal synchronisiert: @@ -417,7 +417,7 @@ - Synchronization of the following directories on %1 complete: + Synchronization of the following folders on %1 complete: Folgende Verzeichnisse wurden auf %1 synchronisiert: diff --git a/syncthingconnector/translations/syncthingconnector_en_US.ts b/syncthingconnector/translations/syncthingconnector_en_US.ts index b21d27b..17ab200 100644 --- a/syncthingconnector/translations/syncthingconnector_en_US.ts +++ b/syncthingconnector/translations/syncthingconnector_en_US.ts @@ -56,7 +56,7 @@ - Unable to rescan: No directory ID specified. + Unable to rescan: No folder ID specified. @@ -66,7 +66,7 @@ - Unable to pause/resume a directories when not connected + Unable to pause/resume a folders when not connected @@ -126,13 +126,13 @@ - Unable to parse directory statistics: + Unable to parse folder statistics: - Unable to request directory statistics: + Unable to request folder statistics: @@ -187,7 +187,7 @@ - Unable to request directory pause/resume: + Unable to request folder pause/resume: @@ -202,27 +202,27 @@ - Unable to parse status for directory %1: + Unable to parse status for folder %1: - Unable to parse pull errors for directory %1: + Unable to parse pull errors for folder %1: - Unable to request pull errors for directory %1: + Unable to request pull errors for folder %1: - Unable to parse completion for device/directory %1/%2: + Unable to parse completion for device/folder %1/%2: - Unable to request completion for device/directory %1/%2: + Unable to request completion for device/folder %1/%2: @@ -280,12 +280,12 @@ - wants to share directory %1. + wants to share folder %1. - wants to share directory %1 (%2). + wants to share folder %1 (%2). @@ -372,12 +372,12 @@ - Synchronization of local directory %1 complete + Synchronization of local folder %1 complete - Synchronization of the following local directories complete: + Synchronization of the following local folders complete: @@ -408,7 +408,7 @@ - Synchronization of the following directories on %1 complete: + Synchronization of the following folders on %1 complete: diff --git a/syncthingconnector/translations/syncthingconnector_zh_CN.ts b/syncthingconnector/translations/syncthingconnector_zh_CN.ts index 3436c1d..bf9b556 100644 --- a/syncthingconnector/translations/syncthingconnector_zh_CN.ts +++ b/syncthingconnector/translations/syncthingconnector_zh_CN.ts @@ -15,17 +15,17 @@ - Unable to pause/resume a directories when not connected + Unable to pause/resume a folders when not connected 未连接时无法暂停/恢复目录 - Unable to request directory pause/resume: + Unable to request folder pause/resume: 无法请求目录暂停/恢复： - Unable to rescan: No directory ID specified. + Unable to rescan: No folder ID specified. 无法重新扫描：未指定目录 ID。 @@ -90,38 +90,38 @@ - Unable to parse directory statistics: + Unable to parse folder statistics: 无法解析目录统计信息： - Unable to request directory statistics: + Unable to request folder statistics: 无法请求目录统计信息： - Unable to parse status for directory %1: + Unable to parse status for folder %1: 无法解析目录 %1 的状态： - Unable to parse pull errors for directory %1: + Unable to parse pull errors for folder %1: 无法解析目录 %1 的拉取错误： - Unable to request pull errors for directory %1: + Unable to request pull errors for folder %1: 无法请求目录 %1 的拉取错误： - Unable to parse completion for device/directory %1/%2: + Unable to parse completion for device/folder %1/%2: 无法解析设备/目录 %1/%2 的完成情况： - Unable to request completion for device/directory %1/%2: + Unable to request completion for device/folder %1/%2: 无法请求设备/目录 %1/%2 的完成情况： @@ -280,12 +280,12 @@ - wants to share directory %1. + wants to share folder %1. 想要分享目录 %1。 - wants to share directory %1 (%2). + wants to share folder %1 (%2). 想要分享目录 %1 (%2)。 @@ -370,7 +370,7 @@ - Synchronization of local directory %1 complete + Synchronization of local folder %1 complete 完成本地目录 %1 的同步 @@ -380,14 +380,14 @@ - Synchronization of the following local directories complete: + Synchronization of the following local folders complete: 完成以下本地目录的同步： - Synchronization of the following directories on %1 complete: + Synchronization of the following folders on %1 complete: 完成以下目录在 %1 上的同步： diff --git a/syncthingconnector/utils.cpp b/syncthingconnector/utils.cpp index cc66c02..021dad5 100644 --- a/syncthingconnector/utils.cpp +++ b/syncthingconnector/utils.cpp @@ -73,7 +73,7 @@ QString syncCompleteString(const std::vector &completedDir return QString(); case 1: if (devName.isEmpty()) { - return QCoreApplication::translate("Data::Utils", "Synchronization of local directory %1 complete") + return QCoreApplication::translate("Data::Utils", "Synchronization of local folder %1 complete") .arg(completedDirs.front()->displayName()); } return QCoreApplication::translate("Data::Utils", "Synchronization of %1 on %2 complete").arg(completedDirs.front()->displayName(), devName); @@ -81,10 +81,10 @@ QString syncCompleteString(const std::vector &completedDir } const auto names(things(completedDirs, [](const auto *dir) { return dir->displayName(); })); if (devName.isEmpty()) { - return QCoreApplication::translate("Data::Utils", "Synchronization of the following local directories complete:\n") + return QCoreApplication::translate("Data::Utils", "Synchronization of the following local folders complete:\n") + names.join(QStringLiteral(", ")); } - return QCoreApplication::translate("Data::Utils", "Synchronization of the following directories on %1 complete:\n").arg(devName) + return QCoreApplication::translate("Data::Utils", "Synchronization of the following folders on %1 complete:\n").arg(devName) + names.join(QStringLiteral(", ")); } diff --git a/syncthingmodel/syncthingrecentchangesmodel.cpp b/syncthingmodel/syncthingrecentchangesmodel.cpp index ff02bc2..cb2a6ca 100644 --- a/syncthingmodel/syncthingrecentchangesmodel.cpp +++ b/syncthingmodel/syncthingrecentchangesmodel.cpp @@ -72,7 +72,7 @@ QVariant SyncthingRecentChangesModel::headerData(int section, Qt::Orientation or case 1: return tr("Device"); case 2: - return tr("Directory"); + return tr("Folder"); case 3: return tr("Path"); } diff --git a/syncthingmodel/translations/syncthingmodel_cs_CZ.ts b/syncthingmodel/translations/syncthingmodel_cs_CZ.ts index 9a4d55d..3718937 100644 --- a/syncthingmodel/translations/syncthingmodel_cs_CZ.ts +++ b/syncthingmodel/translations/syncthingmodel_cs_CZ.ts @@ -393,7 +393,7 @@ - Directory + Folder diff --git a/syncthingmodel/translations/syncthingmodel_de_DE.ts b/syncthingmodel/translations/syncthingmodel_de_DE.ts index 6566d02..f1a9063 100644 --- a/syncthingmodel/translations/syncthingmodel_de_DE.ts +++ b/syncthingmodel/translations/syncthingmodel_de_DE.ts @@ -391,7 +391,7 @@ - Directory + Folder Verzeichnis diff --git a/syncthingmodel/translations/syncthingmodel_en_US.ts b/syncthingmodel/translations/syncthingmodel_en_US.ts index f0d7f02..25f55cf 100644 --- a/syncthingmodel/translations/syncthingmodel_en_US.ts +++ b/syncthingmodel/translations/syncthingmodel_en_US.ts @@ -391,7 +391,7 @@ - Directory + Folder diff --git a/syncthingmodel/translations/syncthingmodel_zh_CN.ts b/syncthingmodel/translations/syncthingmodel_zh_CN.ts index a729451..1b41c17 100644 --- a/syncthingmodel/translations/syncthingmodel_zh_CN.ts +++ b/syncthingmodel/translations/syncthingmodel_zh_CN.ts @@ -389,7 +389,7 @@ - Directory + Folder 目录 diff --git a/syncthingwidgets/misc/dbusstatusnotifier.cpp b/syncthingwidgets/misc/dbusstatusnotifier.cpp index eae0803..0005ae7 100644 --- a/syncthingwidgets/misc/dbusstatusnotifier.cpp +++ b/syncthingwidgets/misc/dbusstatusnotifier.cpp @@ -27,7 +27,7 @@ DBusStatusNotifier::DBusStatusNotifier(QObject *parent) , m_syncthingNotification(tr("Syncthing notification"), NotificationIcon::Warning, 10000) , m_syncCompleteNotification(QStringLiteral(APP_NAME), NotificationIcon::Information, 5000) , m_newDevNotification(QStringLiteral(APP_NAME) + tr(" - new device"), NotificationIcon::Information, 5000) - , m_newDirNotification(QStringLiteral(APP_NAME) + tr(" - new directory"), NotificationIcon::Information, 5000) + , m_newDirNotification(QStringLiteral(APP_NAME) + tr(" - new folder"), NotificationIcon::Information, 5000) { m_disconnectedNotification.setApplicationName(QStringLiteral(APP_NAME)); m_disconnectedNotification.setMessage(tr("Disconnected from Syncthing")); diff --git a/syncthingwidgets/misc/direrrorsdialog.cpp b/syncthingwidgets/misc/direrrorsdialog.cpp index 98491c6..ba37881 100644 --- a/syncthingwidgets/misc/direrrorsdialog.cpp +++ b/syncthingwidgets/misc/direrrorsdialog.cpp @@ -25,7 +25,7 @@ using namespace Data; namespace QtGui { DirectoryErrorsDialog::DirectoryErrorsDialog(const Data::SyncthingConnection &connection, const Data::SyncthingDir &dir, QWidget *parent) - : TextViewDialog(tr("Errors for directory %1").arg(dir.displayName()), parent) + : TextViewDialog(tr("Errors for folder %1").arg(dir.displayName()), parent) , m_connection(connection) , m_dirId(dir.id) { diff --git a/syncthingwidgets/misc/statusinfo.cpp b/syncthingwidgets/misc/statusinfo.cpp index ddd3688..2d6fce1 100644 --- a/syncthingwidgets/misc/statusinfo.cpp +++ b/syncthingwidgets/misc/statusinfo.cpp @@ -60,11 +60,11 @@ void StatusInfo::updateConnectionStatus(const SyncthingConnection &connection, c switch (connection.status()) { case SyncthingStatus::Synchronizing: m_statusText = QCoreApplication::translate("QtGui::StatusInfo", "Synchronization is ongoing"); - m_additionalStatusInfo = QCoreApplication::translate("QtGui::StatusInfo", "At least one directory is out of sync"); + m_additionalStatusInfo = QCoreApplication::translate("QtGui::StatusInfo", "At least one folder is out of sync"); m_statusIcon = &icons.errorSync; break; default: - m_statusText = QCoreApplication::translate("QtGui::StatusInfo", "At least one directory is out of sync"); + m_statusText = QCoreApplication::translate("QtGui::StatusInfo", "At least one folder is out of sync"); m_statusIcon = &icons.error; } } else if (connection.hasUnreadNotifications() && (connection.statusComputionFlags() & SyncthingStatusComputionFlags::UnreadNotifications)) { @@ -89,7 +89,7 @@ void StatusInfo::updateConnectionStatus(const SyncthingConnection &connection, c m_statusIcon = &icons.sync; break; case SyncthingStatus::RemoteNotInSync: - m_statusText = QCoreApplication::translate("QtGui::StatusInfo", "At least one remote directory is not in sync"); + m_statusText = QCoreApplication::translate("QtGui::StatusInfo", "At least one remote folder is not in sync"); m_statusIcon = &icons.sync; break; default: diff --git a/syncthingwidgets/settings/notificationsoptionpage.ui b/syncthingwidgets/settings/notificationsoptionpage.ui index 9867211..0d3dbc8 100644 --- a/syncthingwidgets/settings/notificationsoptionpage.ui +++ b/syncthingwidgets/settings/notificationsoptionpage.ui @@ -40,14 +40,14 @@ - sync of local directory complete + sync of local folder complete - sync of remote directory complete + sync of remote folder complete @@ -61,7 +61,7 @@ - remote device shares new/unknown directory + remote device shares new/unknown folder diff --git a/syncthingwidgets/translations/syncthingwidgets_cs_CZ.ts b/syncthingwidgets/translations/syncthingwidgets_cs_CZ.ts index 452b72e..45d3a1a 100644 --- a/syncthingwidgets/translations/syncthingwidgets_cs_CZ.ts +++ b/syncthingwidgets/translations/syncthingwidgets_cs_CZ.ts @@ -713,7 +713,7 @@ - - new directory + - new folder @@ -800,7 +800,7 @@ QtGui::DirectoryErrorsDialog - Errors for directory %1 + Errors for folder %1 @@ -1386,12 +1386,12 @@ - sync of local directory complete + sync of local folder complete - sync of remote directory complete + sync of remote folder complete @@ -1401,7 +1401,7 @@ - remote device shares new/unknown directory + remote device shares new/unknown folder @@ -1542,7 +1542,7 @@ - At least one directory is out of sync + At least one folder is out of sync @@ -1567,7 +1567,7 @@ - At least one remote directory is not in sync + At least one remote folder is not in sync diff --git a/syncthingwidgets/translations/syncthingwidgets_de_DE.ts b/syncthingwidgets/translations/syncthingwidgets_de_DE.ts index 986259f..ef8722f 100644 --- a/syncthingwidgets/translations/syncthingwidgets_de_DE.ts +++ b/syncthingwidgets/translations/syncthingwidgets_de_DE.ts @@ -857,7 +857,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet. - - new directory + - new folder - neues Verzeichnis @@ -952,7 +952,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.QtGui::DirectoryErrorsDialog - Errors for directory %1 + Errors for folder %1 Fehler für Verzeichnis %1 @@ -1577,12 +1577,12 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet. - sync of local directory complete + sync of local folder complete die Synchronisation lokaler Verzeichnisse abgeschlossen wurde - sync of remote directory complete + sync of remote folder complete die Synchronisation von Verzeichnissen auf anderen Geräten abgeschlossen wurde @@ -1592,7 +1592,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet. - remote device shares new/unknown directory + remote device shares new/unknown folder ein anderes Geräte ein neues/unbekanntes Verzeichnis teilen möchte @@ -1724,7 +1724,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet. - At least one directory is out of sync + At least one folder is out of sync Mind. ein Verzeichnis hat Fehler @@ -1749,7 +1749,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet. - At least one remote directory is not in sync + At least one remote folder is not in sync Mind. ein entferntes Verzeichnis ist nicht synchronisiert diff --git a/syncthingwidgets/translations/syncthingwidgets_en_US.ts b/syncthingwidgets/translations/syncthingwidgets_en_US.ts index b67b3d4..a18a7c4 100644 --- a/syncthingwidgets/translations/syncthingwidgets_en_US.ts +++ b/syncthingwidgets/translations/syncthingwidgets_en_US.ts @@ -713,7 +713,7 @@ - - new directory + - new folder @@ -800,7 +800,7 @@ QtGui::DirectoryErrorsDialog - Errors for directory %1 + Errors for folder %1 @@ -1379,12 +1379,12 @@ - sync of local directory complete + sync of local folder complete - sync of remote directory complete + sync of remote folder complete @@ -1394,7 +1394,7 @@ - remote device shares new/unknown directory + remote device shares new/unknown folder @@ -1514,7 +1514,7 @@ - At least one directory is out of sync + At least one folder is out of sync @@ -1539,7 +1539,7 @@ - At least one remote directory is not in sync + At least one remote folder is not in sync diff --git a/syncthingwidgets/translations/syncthingwidgets_zh_CN.ts b/syncthingwidgets/translations/syncthingwidgets_zh_CN.ts index c6a1464..54a989f 100644 --- a/syncthingwidgets/translations/syncthingwidgets_zh_CN.ts +++ b/syncthingwidgets/translations/syncthingwidgets_zh_CN.ts @@ -731,7 +731,7 @@ The Web UI will be opened in the default web browser instead. - - new directory + - new folder - 新目录 @@ -822,7 +822,7 @@ The Web UI will be opened in the default web browser instead. QtGui::DirectoryErrorsDialog - Errors for directory %1 + Errors for folder %1 目录 %1 的错误 @@ -1420,12 +1420,12 @@ The Web UI will be opened in the default web browser instead. - sync of local directory complete + sync of local folder complete 本地目录同步完成 - sync of remote directory complete + sync of remote folder complete 远程目录同步完成 @@ -1435,7 +1435,7 @@ The Web UI will be opened in the default web browser instead. - remote device shares new/unknown directory + remote device shares new/unknown folder 远程设备共享新/未知目录 @@ -1584,7 +1584,7 @@ The Web UI will be opened in the default web browser instead. - At least one directory is out of sync + At least one folder is out of sync 至少有一个目录未同步 @@ -1609,7 +1609,7 @@ The Web UI will be opened in the default web browser instead. - At least one remote directory is not in sync + At least one remote folder is not in sync 至少有一个远程目录未同步 diff --git a/tray/gui/trayicon.cpp b/tray/gui/trayicon.cpp index cd9988f..f40b16a 100644 --- a/tray/gui/trayicon.cpp +++ b/tray/gui/trayicon.cpp @@ -293,7 +293,7 @@ void TrayIcon::showNewDir(const QString &devId, const QString &dirId, const QStr #endif { m_messageClickedAction = TrayIconMessageClickedAction::ShowWebUi; - showMessage(tr("New Syncthing directory - click for web UI"), message, QSystemTrayIcon::Information); + showMessage(tr("New Syncthing folder - click for web UI"), message, QSystemTrayIcon::Information); } } diff --git a/tray/gui/traywidget.cpp b/tray/gui/traywidget.cpp index c46f547..b840909 100644 --- a/tray/gui/traywidget.cpp +++ b/tray/gui/traywidget.cpp @@ -139,7 +139,7 @@ TrayWidget::TrayWidget(TrayMenu *parent) showLogButton->setFlat(true); cornerFrameLayout->addWidget(showLogButton); auto *scanAllButton = new QPushButton(m_cornerFrame); - scanAllButton->setToolTip(tr("Rescan all directories")); + scanAllButton->setToolTip(tr("Rescan all folders")); scanAllButton->setIcon(QIcon(QStringLiteral("refresh.fa"))); scanAllButton->setFlat(true); cornerFrameLayout->addWidget(scanAllButton); @@ -660,7 +660,7 @@ void TrayWidget::openDir(const SyncthingDir &dir) if (QDir(path).exists()) { openLocalFileOrDir(path); } else { - QMessageBox::warning(this, QCoreApplication::applicationName(), tr("The directory %1 does not exist on the local machine.").arg(path)); + QMessageBox::warning(this, QCoreApplication::applicationName(), tr("The folder %1 does not exist on the local machine.").arg(path)); } } @@ -671,7 +671,7 @@ void TrayWidget::openItemDir(const SyncthingItemDownloadProgress &item) openLocalFileOrDir(containingDir.path()); } else { QMessageBox::warning(this, QCoreApplication::applicationName(), - tr("The containing directory %1 does not exist on the local machine.").arg(item.fileInfo.filePath())); + tr("The containing folder %1 does not exist on the local machine.").arg(item.fileInfo.filePath())); } } @@ -721,7 +721,7 @@ void TrayWidget::showRecentChangesContextMenu(const QPoint &position) tr("Copy device ID")), &QAction::triggered, this, copyRole(SyncthingRecentChangesModel::ModifiedBy)); connect(menu.addAction(QIcon::fromTheme(QStringLiteral("folder"), QIcon(QStringLiteral(":/icons/hicolor/scalable/places/folder.svg"))), - tr("Copy directory ID")), + tr("Copy folder ID")), &QAction::triggered, this, copyRole(SyncthingRecentChangesModel::DirectoryId)); showViewMenu(position, *m_ui->recentChangesTreeView, menu); } diff --git a/tray/gui/traywidget.ui b/tray/gui/traywidget.ui index 90680c7..1b23dbe 100644 --- a/tray/gui/traywidget.ui +++ b/tray/gui/traywidget.ui @@ -385,7 +385,7 @@ For <i>all</i> notifications, checkout the log folder.fafolder.fa - Directories + Folders diff --git a/tray/translations/syncthingtray_cs_CZ.ts b/tray/translations/syncthingtray_cs_CZ.ts index 18b108e..3575315 100644 --- a/tray/translations/syncthingtray_cs_CZ.ts +++ b/tray/translations/syncthingtray_cs_CZ.ts @@ -134,7 +134,7 @@ - New Syncthing directory - click for web UI + New Syncthing folder - click for web UI Nový Syncthing adresář – klikněte pro webové rozhraní @@ -253,7 +253,7 @@ For <i>all</i> notifications, checkout the log - Directories + Folders Adresáře @@ -298,7 +298,7 @@ For <i>all</i> notifications, checkout the log - Rescan all directories + Rescan all folders Znovu proskenovat všechny složky @@ -368,12 +368,12 @@ For <i>all</i> notifications, checkout the log - The directory <i>%1</i> does not exist on the local machine. + The folder <i>%1</i> does not exist on the local machine. Adresář <i>%1</i> neexistuje místně. - The containing directory <i>%1</i> does not exist on the local machine. + The containing folder <i>%1</i> does not exist on the local machine. Obsažený adresář <i>%1</i> neexistuje místně. @@ -388,7 +388,7 @@ For <i>all</i> notifications, checkout the log - Copy directory ID + Copy folder ID diff --git a/tray/translations/syncthingtray_de_DE.ts b/tray/translations/syncthingtray_de_DE.ts index 49cb73d..f483d95 100644 --- a/tray/translations/syncthingtray_de_DE.ts +++ b/tray/translations/syncthingtray_de_DE.ts @@ -134,7 +134,7 @@ - New Syncthing directory - click for web UI + New Syncthing folder - click for web UI Neues Syncthing-Verzeichnis @@ -257,7 +257,7 @@ For <i>all</i> notifications, checkout the log - Directories + Folders Verzeichnisse @@ -303,7 +303,7 @@ For <i>all</i> notifications, checkout the log - Rescan all directories + Rescan all folders Alle Verzeichnisse neu scannen @@ -373,12 +373,12 @@ For <i>all</i> notifications, checkout the log - The directory <i>%1</i> does not exist on the local machine. + The folder <i>%1</i> does not exist on the local machine. Das Verzeichnis <i>%1</i> existiert nicht lokal. - The containing directory <i>%1</i> does not exist on the local machine. + The containing folder <i>%1</i> does not exist on the local machine. Das beinhaltende Verzeichnis <i>%1</i> existiert nicht lokal. @@ -393,7 +393,7 @@ For <i>all</i> notifications, checkout the log - Copy directory ID + Copy folder ID Verzeichnis-ID kopieren diff --git a/tray/translations/syncthingtray_en_US.ts b/tray/translations/syncthingtray_en_US.ts index 891ff92..190eff3 100644 --- a/tray/translations/syncthingtray_en_US.ts +++ b/tray/translations/syncthingtray_en_US.ts @@ -144,7 +144,7 @@ - New Syncthing directory - click for web UI + New Syncthing folder - click for web UI @@ -252,7 +252,7 @@ For <i>all</i> notifications, checkout the log - Directories + Folders @@ -297,7 +297,7 @@ For <i>all</i> notifications, checkout the log - Rescan all directories + Rescan all folders @@ -367,12 +367,12 @@ For <i>all</i> notifications, checkout the log - The directory <i>%1</i> does not exist on the local machine. + The folder <i>%1</i> does not exist on the local machine. - The containing directory <i>%1</i> does not exist on the local machine. + The containing folder <i>%1</i> does not exist on the local machine. @@ -387,7 +387,7 @@ For <i>all</i> notifications, checkout the log - Copy directory ID + Copy folder ID diff --git a/tray/translations/syncthingtray_zh_CN.ts b/tray/translations/syncthingtray_zh_CN.ts index d08c538..c510e02 100644 --- a/tray/translations/syncthingtray_zh_CN.ts +++ b/tray/translations/syncthingtray_zh_CN.ts @@ -149,7 +149,7 @@ - New Syncthing directory - click for web UI + New Syncthing folder - click for web UI 新 Syncthing 目录 - 点击打开网页 UI @@ -253,7 +253,7 @@ For <i>all</i> notifications, checkout the log - Directories + Folders 目录 @@ -298,7 +298,7 @@ For <i>all</i> notifications, checkout the log - Rescan all directories + Rescan all folders 重新扫描全部目录 @@ -368,12 +368,12 @@ For <i>all</i> notifications, checkout the log - The directory <i>%1</i> does not exist on the local machine. + The folder <i>%1</i> does not exist on the local machine. 本地设备上不存在目录 <i>%1</i>。 - The containing directory <i>%1</i> does not exist on the local machine. + The containing folder <i>%1</i> does not exist on the local machine. 本地设备上不存在包含目录 <i>%1</i>。 @@ -388,7 +388,7 @@ For <i>all</i> notifications, checkout the log - Copy directory ID + Copy folder ID