Change Directory to Folder in user-facing strings

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
+    * Trigger re-scan of a specific folder or all folders at once
-    * Open a directory with the default file browser
+    * 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
+    * Supports Bash completion, even for folder and device names
-* Also bundles a KIO plugin which shows the status of a Syncthing directory and allows to trigger Syncthing actions
+* 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
+    * Rescan entire Syncthing folder
-    * Pause/resume Syncthing directory
+    * 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

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() << "\" ...";
     }

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")
+    , rescan("rescan", 'r', "rescans the specified folders")
-    , rescanAll("rescan-all", '\0', "rescans all directories")
+    , rescanAll("rescan-all", '\0', "rescans all folders")
-    , pause("pause", '\0', "pauses the specified directories and devices")
+    , pause("pause", '\0', "pauses the specified folders and devices")
-    , resume("resume", '\0', "resumes the specified directories 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" })

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);

fileitemactionplugin/syncthingfileitemaction.cpp

@@ -171,7 +171,7 @@ QList<QAction *> 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<QAction *> 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<QAction *> 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<QAction *> 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()) {

fileitemactionplugin/translations/syncthingfileitemaction_cs_CZ.ts

@@ -10,7 +10,7 @@
     </message>
     <message>
         <location filename="../syncthingdiractions.cpp" line="43"/>
-        <source>Directory info for %1</source>
+        <source>Folder info for %1</source>
         <translation>Informace o adresáři pro %1</translation>
     </message>
     <message>
@@ -56,12 +56,12 @@
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="174"/>
-        <source>Rescan selected directories</source>
+        <source>Rescan selected folders</source>
         <translation>Znovu prohledat označené adresáře</translation>
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="187"/>
-        <source>Resume selected directories</source>
+        <source>Resume selected folders</source>
         <translation>Pokračovat označené adresáře</translation>
     </message>
     <message>
@@ -73,17 +73,17 @@
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="190"/>
-        <source>Pause selected directories</source>
+        <source>Pause selected folders</source>
         <translation>Pozastavit označené adresáře</translation>
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="205"/>
-        <source>Rescan containing directories</source>
+        <source>Rescan containing folders</source>
         <translation>Znovu prohledat obsažené adresáře</translation>
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="218"/>
-        <source>Resume containing directories</source>
+        <source>Resume containing folders</source>
         <translation>Pokračovat obsažené adresáře</translation>
     </message>
     <message>
@@ -94,7 +94,7 @@
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="222"/>
-        <source>Pause containing directories</source>
+        <source>Pause containing folders</source>
         <translation>Pozastavit obsažené adresáře</translation>
     </message>
     <message>

fileitemactionplugin/translations/syncthingfileitemaction_de_DE.ts

@@ -10,7 +10,7 @@
     </message>
     <message>
         <location filename="../syncthingdiractions.cpp" line="43"/>
-        <source>Directory info for %1</source>
+        <source>Folder info for %1</source>
         <translation>Verzeichnisinfo für %1</translation>
     </message>
     <message>
@@ -56,12 +56,12 @@
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="174"/>
-        <source>Rescan selected directories</source>
+        <source>Rescan selected folders</source>
         <translation>Ausgewählte Verzeichnisse neu scannen</translation>
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="187"/>
-        <source>Resume selected directories</source>
+        <source>Resume selected folders</source>
         <translation>Ausgewählte verzeichnisse fortsetzen</translation>
     </message>
     <message>
@@ -73,17 +73,17 @@
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="190"/>
-        <source>Pause selected directories</source>
+        <source>Pause selected folders</source>
         <translation>Ausgewählte Verzeichnisse pausieren</translation>
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="205"/>
-        <source>Rescan containing directories</source>
+        <source>Rescan containing folders</source>
         <translation>Beinhaltendes Verzeichnis neu scannen</translation>
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="218"/>
-        <source>Resume containing directories</source>
+        <source>Resume containing folders</source>
         <translation>Beinhaltendes Verzeichnis fortsetzen</translation>
     </message>
     <message>
@@ -99,7 +99,7 @@
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="222"/>
-        <source>Pause containing directories</source>
+        <source>Pause containing folders</source>
         <translation>Beinhaltendes Verzeichnis pausieren</translation>
     </message>
     <message>

fileitemactionplugin/translations/syncthingfileitemaction_en_US.ts

@@ -10,7 +10,7 @@
     </message>
     <message>
         <location filename="../syncthingdiractions.cpp" line="43"/>
-        <source>Directory info for %1</source>
+        <source>Folder info for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -61,7 +61,7 @@
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="174"/>
-        <source>Rescan selected directories</source>
+        <source>Rescan selected folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -73,22 +73,22 @@
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="187"/>
-        <source>Resume selected directories</source>
+        <source>Resume selected folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="190"/>
-        <source>Pause selected directories</source>
+        <source>Pause selected folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="205"/>
-        <source>Rescan containing directories</source>
+        <source>Rescan containing folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="218"/>
-        <source>Resume containing directories</source>
+        <source>Resume containing folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -99,7 +99,7 @@
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="222"/>
-        <source>Pause containing directories</source>
+        <source>Pause containing folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

fileitemactionplugin/translations/syncthingfileitemaction_zh_CN.ts

@@ -10,7 +10,7 @@
     </message>
     <message>
         <location filename="../syncthingdiractions.cpp" line="43"/>
-        <source>Directory info for %1</source>
+        <source>Folder info for %1</source>
         <translation>%1 的目录信息</translation>
     </message>
     <message>
@@ -62,7 +62,7 @@
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="174"/>
-        <source>Rescan selected directories</source>
+        <source>Rescan selected folders</source>
         <translation>重新扫描选定的目录</translation>
     </message>
     <message>
@@ -73,7 +73,7 @@
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="187"/>
-        <source>Resume selected directories</source>
+        <source>Resume selected folders</source>
         <translation>恢复选定的目录</translation>
     </message>
     <message>
@@ -84,22 +84,22 @@
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="190"/>
-        <source>Pause selected directories</source>
+        <source>Pause selected folders</source>
         <translation>暂停选定的目录</translation>
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="205"/>
-        <source>Rescan containing directories</source>
+        <source>Rescan containing folders</source>
         <translation>重新扫描包含的目录</translation>
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="218"/>
-        <source>Resume containing directories</source>
+        <source>Resume containing folders</source>
         <translation>恢复包含的目录</translation>
     </message>
     <message>
         <location filename="../syncthingfileitemaction.cpp" line="222"/>
-        <source>Pause containing directories</source>
+        <source>Pause containing folders</source>
         <translation>暂停包含的目录</translation>
     </message>
     <message>

plasmoid/lib/appearanceoptionpage.ui

@@ -22,7 +22,7 @@
       <item row="0" column="0">
        <widget class="QLabel" name="sizeLabel">
         <property name="text">
-         <string>Size of directory/device/download list</string>
+         <string>Size of folder/device/download list</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>

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
             }

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()
                 }

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"

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")

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
             }

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()
                 }

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"

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()
         },

plasmoid/translations/syncthingplasmoid_cs_CZ.ts

@@ -108,7 +108,7 @@
     </message>
     <message>
         <location filename="../package/contents/ui/FullRepresentation.qml" line="361"/>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation>Znovu proskenovat všechny adresáře</translation>
     </message>
     <message>
@@ -294,7 +294,7 @@
     </message>
     <message>
         <location filename="../package/contents/ui/main.qml" line="64"/>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation>Znovu proskenovat všechny adresáře</translation>
     </message>
     <message>

plasmoid/translations/syncthingplasmoid_de_DE.ts

@@ -150,7 +150,7 @@
         <translation type="vanished">Syncthing-Log anzeigen</translation>
     </message>
     <message>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation type="vanished">Alle Verzeichnisse neu scannen</translation>
     </message>
     <message>
@@ -188,7 +188,7 @@
     <message>
         <location filename="../package6/contents/ui/FullRepresentation.qml" line="34"/>
         <location filename="../package5/contents/ui/FullRepresentation.qml" line="33"/>
-        <source>Directories</source>
+        <source>Folders</source>
         <translation>Verzeichnisse</translation>
     </message>
     <message>
@@ -230,7 +230,7 @@
     </message>
     <message>
         <location filename="../lib/appearanceoptionpage.ui" line="25"/>
-        <source>Size of directory/device/download list</source>
+        <source>Size of folder/device/download list</source>
         <translation>Größe der Verzeichnis-/Geräte-/Downloadliste</translation>
     </message>
     <message>
@@ -375,7 +375,7 @@
     <message>
         <location filename="../package6/contents/ui/RecentChangesPage.qml" line="120"/>
         <location filename="../package5/contents/ui/RecentChangesPage.qml" line="119"/>
-        <source>Copy directory ID</source>
+        <source>Copy folder ID</source>
         <translation>Verzeichnis-ID kopieren</translation>
     </message>
 </context>
@@ -465,7 +465,7 @@
     <message>
         <location filename="../package6/contents/ui/ToolBar.qml" line="229"/>
         <location filename="../package5/contents/ui/ToolBar.qml" line="230"/>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation>Alle Verzeichnisse neu scannen</translation>
     </message>
     <message>
@@ -520,7 +520,7 @@
     <message>
         <location filename="../package6/contents/ui/main.qml" line="34"/>
         <location filename="../package5/contents/ui/main.qml" line="61"/>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation>Alle Verzeichnisse neu scannen</translation>
     </message>
     <message>

plasmoid/translations/syncthingplasmoid_en_US.ts

@@ -44,7 +44,7 @@
     <message>
         <location filename="../package6/contents/ui/DirectoriesPage.qml" line="23"/>
         <location filename="../package5/contents/ui/DirectoriesPage.qml" line="23"/>
-        <source>Filter directories</source>
+        <source>Filter folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -144,7 +144,7 @@
     <message>
         <location filename="../package6/contents/ui/FullRepresentation.qml" line="34"/>
         <location filename="../package5/contents/ui/FullRepresentation.qml" line="33"/>
-        <source>Directories</source>
+        <source>Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -181,7 +181,7 @@
     </message>
     <message>
         <location filename="../lib/appearanceoptionpage.ui" line="25"/>
-        <source>Size of directory/device/download list</source>
+        <source>Size of folder/device/download list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -309,7 +309,7 @@
     <message>
         <location filename="../package6/contents/ui/RecentChangesPage.qml" line="120"/>
         <location filename="../package5/contents/ui/RecentChangesPage.qml" line="119"/>
-        <source>Copy directory ID</source>
+        <source>Copy folder ID</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -399,7 +399,7 @@
     <message>
         <location filename="../package6/contents/ui/ToolBar.qml" line="229"/>
         <location filename="../package5/contents/ui/ToolBar.qml" line="230"/>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -432,7 +432,7 @@
     <message>
         <location filename="../package6/contents/ui/main.qml" line="34"/>
         <location filename="../package5/contents/ui/main.qml" line="61"/>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

plasmoid/translations/syncthingplasmoid_zh_CN.ts

@@ -138,7 +138,7 @@
     </message>
     <message>
         <location filename="../package/contents/ui/FullRepresentation.qml" line="399"/>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation>重新扫描所有目录</translation>
     </message>
     <message>
@@ -186,7 +186,7 @@
     </message>
     <message>
         <location filename="../lib/appearanceoptionpage.ui" line="25"/>
-        <source>Size of directory/device/download list</source>
+        <source>Size of folder/device/download list</source>
         <translation>目录/设备/下载列表的大小</translation>
     </message>
     <message>
@@ -332,7 +332,7 @@
     </message>
     <message>
         <location filename="../package/contents/ui/main.qml" line="72"/>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation>重新扫描所有目录</translation>
     </message>
     <message>

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;
             }
         });

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);
 }

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);

syncthingconnector/translations/syncthingconnector_cs_CZ.ts

@@ -60,7 +60,7 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="473"/>
-        <source>Unable to rescan: No directory ID specified.</source>
+        <source>Unable to rescan: No folder ID specified.</source>
         <translation>Nedaří se znovu prohledat: nezadán žádný identifikátor adresáře.</translation>
     </message>
     <message>
@@ -70,7 +70,7 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="405"/>
-        <source>Unable to pause/resume a directories when not connected</source>
+        <source>Unable to pause/resume a folders when not connected</source>
         <translation>Nedaří se pozastavit/pokračovat složky, když není spojeno</translation>
     </message>
     <message>
@@ -130,13 +130,13 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1016"/>
-        <source>Unable to parse directory statistics: </source>
+        <source>Unable to parse folder statistics: </source>
         <translation>Nedaří se zpracovat statistiky adresáře: </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1067"/>
         <location filename="../syncthingconnection_requests.cpp" line="1125"/>
-        <source>Unable to request directory statistics: </source>
+        <source>Unable to request folder statistics: </source>
         <translation>Nedaří se vyžádat si statistiky adresáře: </translation>
     </message>
     <message>
@@ -191,7 +191,7 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="442"/>
-        <source>Unable to request directory pause/resume: </source>
+        <source>Unable to request folder pause/resume: </source>
         <translation>Nedaří se vyžádat si pozastavení/pokračování adresáře: </translation>
     </message>
     <message>
@@ -206,27 +206,27 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1110"/>
-        <source>Unable to parse status for directory %1: </source>
+        <source>Unable to parse status for folder %1: </source>
         <translation>Nedaří se zpracovat stav adresáře %1: </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1173"/>
-        <source>Unable to parse pull errors for directory %1: </source>
+        <source>Unable to parse pull errors for folder %1: </source>
         <translation>Nedaří se zpracovat chyby příjmu pro adresář %1: </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1183"/>
-        <source>Unable to request pull errors for directory %1: </source>
+        <source>Unable to request pull errors for folder %1: </source>
         <translation>Nedaří se vyžádat si chyby pro adresář %1: </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1249"/>
-        <source>Unable to parse completion for device/directory %1/%2: </source>
+        <source>Unable to parse completion for device/folder %1/%2: </source>
         <translation>Nedaří se zpracovat stupeň dokončení pro zařízení/adresář %1/%2: </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1264"/>
-        <source>Unable to request completion for device/directory %1/%2: </source>
+        <source>Unable to request completion for device/folder %1/%2: </source>
         <translation>Nedaří se vyžádat si stupeň dokončení pro zařízení/složku %1/%2: </translation>
     </message>
     <message>
@@ -284,12 +284,12 @@
     </message>
     <message>
         <location filename="../syncthingnotifier.cpp" line="91"/>
-        <source> wants to share directory %1.</source>
+        <source> wants to share folder %1.</source>
         <translation> chce sdílet adresář %1.</translation>
     </message>
     <message>
         <location filename="../syncthingnotifier.cpp" line="93"/>
-        <source> wants to share directory %1 (%2).</source>
+        <source> wants to share folder %1 (%2).</source>
         <translation> chce sdílet složku %1 (%2).</translation>
     </message>
     <message>
@@ -382,12 +382,12 @@
     </message>
     <message>
         <location filename="../utils.cpp" line="76"/>
-        <source>Synchronization of local directory %1 complete</source>
+        <source>Synchronization of local folder %1 complete</source>
         <translation>Synchronizace místního adresáře %1 dokončena</translation>
     </message>
     <message>
         <location filename="../utils.cpp" line="84"/>
-        <source>Synchronization of the following local directories complete:
+        <source>Synchronization of the following local folders complete:
 </source>
         <translation>Synchronizace následujících místních adresářů dokončena:
 </translation>
@@ -419,7 +419,7 @@
     </message>
     <message>
         <location filename="../utils.cpp" line="87"/>
-        <source>Synchronization of the following directories on %1 complete:
+        <source>Synchronization of the following folders on %1 complete:
 </source>
         <translation>Synchronizace následujících adresářů na %1 dokončena:
 </translation>

syncthingconnector/translations/syncthingconnector_de_DE.ts

@@ -60,7 +60,7 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="473"/>
-        <source>Unable to rescan: No directory ID specified.</source>
+        <source>Unable to rescan: No folder ID specified.</source>
         <translation>Fehler beim Anfordern eines Scans: keine Verzeichnis-ID angegeben.</translation>
     </message>
     <message>
@@ -70,7 +70,7 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="405"/>
-        <source>Unable to pause/resume a directories when not connected</source>
+        <source>Unable to pause/resume a folders when not connected</source>
         <translation>Fehler beim Anfordern Gerät zu Pausieren/Fortzusetzen</translation>
     </message>
     <message>
@@ -130,13 +130,13 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1016"/>
-        <source>Unable to parse directory statistics: </source>
+        <source>Unable to parse folder statistics: </source>
         <translation>Fehler beim Auslesen der Verzeichnisstatistiken: </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1067"/>
         <location filename="../syncthingconnection_requests.cpp" line="1125"/>
-        <source>Unable to request directory statistics: </source>
+        <source>Unable to request folder statistics: </source>
         <translation>Fehler beim Abfragen der Verzeichnisstatistiken: </translation>
     </message>
     <message>
@@ -191,7 +191,7 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="442"/>
-        <source>Unable to request directory pause/resume: </source>
+        <source>Unable to request folder pause/resume: </source>
         <translation>Fehler beim Anfordern Verzeichnis zu Pausieren/Fortzusetzen: </translation>
     </message>
     <message>
@@ -206,27 +206,27 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1110"/>
-        <source>Unable to parse status for directory %1: </source>
+        <source>Unable to parse status for folder %1: </source>
         <translation>Fehler beim Auslesen des Status von Verzeichnis %1: </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1173"/>
-        <source>Unable to parse pull errors for directory %1: </source>
+        <source>Unable to parse pull errors for folder %1: </source>
         <translation>Fehler beim Auslesen der Fehler von Verzeichnis %1: </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1183"/>
-        <source>Unable to request pull errors for directory %1: </source>
+        <source>Unable to request pull errors for folder %1: </source>
         <translation>Fehler beim Anfordern der Fehler von Verzeichnis %1: </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1249"/>
-        <source>Unable to parse completion for device/directory %1/%2: </source>
+        <source>Unable to parse completion for device/folder %1/%2: </source>
         <translation>Fehler beim Auslesen des Fortschrittes von Verzeichnis %1/%2: </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1264"/>
-        <source>Unable to request completion for device/directory %1/%2: </source>
+        <source>Unable to request completion for device/folder %1/%2: </source>
         <translation>Fehler beim Anfordern des Fortschrittes von Verzeichnis %1/%2: </translation>
     </message>
     <message>
@@ -284,12 +284,12 @@
     </message>
     <message>
         <location filename="../syncthingnotifier.cpp" line="91"/>
-        <source> wants to share directory %1.</source>
+        <source> wants to share folder %1.</source>
         <translation> möchte das Verzeichnis %1 teilen.</translation>
     </message>
     <message>
         <location filename="../syncthingnotifier.cpp" line="93"/>
-        <source> wants to share directory %1 (%2).</source>
+        <source> wants to share folder %1 (%2).</source>
         <translation> möchte das Verzeichnis %1 (%2) teilen.</translation>
     </message>
     <message>
@@ -380,12 +380,12 @@
     </message>
     <message>
         <location filename="../utils.cpp" line="76"/>
-        <source>Synchronization of local directory %1 complete</source>
+        <source>Synchronization of local folder %1 complete</source>
         <translation>%1 wurde lokal synchronisiert</translation>
     </message>
     <message>
         <location filename="../utils.cpp" line="84"/>
-        <source>Synchronization of the following local directories complete:
+        <source>Synchronization of the following local folders complete:
 </source>
         <translation>Folgende Verzeichnisse wurden lokal synchronisiert:
 </translation>
@@ -417,7 +417,7 @@
     </message>
     <message>
         <location filename="../utils.cpp" line="87"/>
-        <source>Synchronization of the following directories on %1 complete:
+        <source>Synchronization of the following folders on %1 complete:
 </source>
         <translation>Folgende Verzeichnisse wurden auf %1 synchronisiert:
 </translation>

syncthingconnector/translations/syncthingconnector_en_US.ts

@@ -56,7 +56,7 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="473"/>
-        <source>Unable to rescan: No directory ID specified.</source>
+        <source>Unable to rescan: No folder ID specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -66,7 +66,7 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="405"/>
-        <source>Unable to pause/resume a directories when not connected</source>
+        <source>Unable to pause/resume a folders when not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -126,13 +126,13 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1016"/>
-        <source>Unable to parse directory statistics: </source>
+        <source>Unable to parse folder statistics: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1067"/>
         <location filename="../syncthingconnection_requests.cpp" line="1125"/>
-        <source>Unable to request directory statistics: </source>
+        <source>Unable to request folder statistics: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -187,7 +187,7 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="442"/>
-        <source>Unable to request directory pause/resume: </source>
+        <source>Unable to request folder pause/resume: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -202,27 +202,27 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1110"/>
-        <source>Unable to parse status for directory %1: </source>
+        <source>Unable to parse status for folder %1: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1173"/>
-        <source>Unable to parse pull errors for directory %1: </source>
+        <source>Unable to parse pull errors for folder %1: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1183"/>
-        <source>Unable to request pull errors for directory %1: </source>
+        <source>Unable to request pull errors for folder %1: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1249"/>
-        <source>Unable to parse completion for device/directory %1/%2: </source>
+        <source>Unable to parse completion for device/folder %1/%2: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1264"/>
-        <source>Unable to request completion for device/directory %1/%2: </source>
+        <source>Unable to request completion for device/folder %1/%2: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -280,12 +280,12 @@
     </message>
     <message>
         <location filename="../syncthingnotifier.cpp" line="91"/>
-        <source> wants to share directory %1.</source>
+        <source> wants to share folder %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../syncthingnotifier.cpp" line="93"/>
-        <source> wants to share directory %1 (%2).</source>
+        <source> wants to share folder %1 (%2).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -372,12 +372,12 @@
     </message>
     <message>
         <location filename="../utils.cpp" line="76"/>
-        <source>Synchronization of local directory %1 complete</source>
+        <source>Synchronization of local folder %1 complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../utils.cpp" line="84"/>
-        <source>Synchronization of the following local directories complete:
+        <source>Synchronization of the following local folders complete:
 </source>
         <translation type="unfinished"></translation>
     </message>
@@ -408,7 +408,7 @@
     </message>
     <message>
         <location filename="../utils.cpp" line="87"/>
-        <source>Synchronization of the following directories on %1 complete:
+        <source>Synchronization of the following folders on %1 complete:
 </source>
         <translation type="unfinished"></translation>
     </message>

syncthingconnector/translations/syncthingconnector_zh_CN.ts

@@ -15,17 +15,17 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="405"/>
-        <source>Unable to pause/resume a directories when not connected</source>
+        <source>Unable to pause/resume a folders when not connected</source>
         <translation>未连接时无法暂停/恢复目录</translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="442"/>
-        <source>Unable to request directory pause/resume: </source>
+        <source>Unable to request folder pause/resume: </source>
         <translation>无法请求目录暂停/恢复： </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="473"/>
-        <source>Unable to rescan: No directory ID specified.</source>
+        <source>Unable to rescan: No folder ID specified.</source>
         <translation>无法重新扫描：未指定目录 ID。</translation>
     </message>
     <message>
@@ -90,38 +90,38 @@
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1016"/>
-        <source>Unable to parse directory statistics: </source>
+        <source>Unable to parse folder statistics: </source>
         <translation>无法解析目录统计信息： </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1067"/>
         <location filename="../syncthingconnection_requests.cpp" line="1125"/>
-        <source>Unable to request directory statistics: </source>
+        <source>Unable to request folder statistics: </source>
         <translation>无法请求目录统计信息： </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1110"/>
-        <source>Unable to parse status for directory %1: </source>
+        <source>Unable to parse status for folder %1: </source>
         <translation>无法解析目录 %1 的状态： </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1173"/>
-        <source>Unable to parse pull errors for directory %1: </source>
+        <source>Unable to parse pull errors for folder %1: </source>
         <translation>无法解析目录 %1 的拉取错误： </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1183"/>
-        <source>Unable to request pull errors for directory %1: </source>
+        <source>Unable to request pull errors for folder %1: </source>
         <translation>无法请求目录 %1 的拉取错误： </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1249"/>
-        <source>Unable to parse completion for device/directory %1/%2: </source>
+        <source>Unable to parse completion for device/folder %1/%2: </source>
         <translation>无法解析设备/目录 %1/%2 的完成情况： </translation>
     </message>
     <message>
         <location filename="../syncthingconnection_requests.cpp" line="1264"/>
-        <source>Unable to request completion for device/directory %1/%2: </source>
+        <source>Unable to request completion for device/folder %1/%2: </source>
         <translation>无法请求设备/目录 %1/%2 的完成情况： </translation>
     </message>
     <message>
@@ -280,12 +280,12 @@
     </message>
     <message>
         <location filename="../syncthingnotifier.cpp" line="91"/>
-        <source> wants to share directory %1.</source>
+        <source> wants to share folder %1.</source>
         <translation> 想要分享目录 %1。</translation>
     </message>
     <message>
         <location filename="../syncthingnotifier.cpp" line="93"/>
-        <source> wants to share directory %1 (%2).</source>
+        <source> wants to share folder %1 (%2).</source>
         <translation> 想要分享目录  %1 (%2)。</translation>
     </message>
     <message>
@@ -370,7 +370,7 @@
     </message>
     <message>
         <location filename="../utils.cpp" line="76"/>
-        <source>Synchronization of local directory %1 complete</source>
+        <source>Synchronization of local folder %1 complete</source>
         <translation>完成本地目录 %1 的同步</translation>
     </message>
     <message>
@@ -380,14 +380,14 @@
     </message>
     <message>
         <location filename="../utils.cpp" line="84"/>
-        <source>Synchronization of the following local directories complete:
+        <source>Synchronization of the following local folders complete:
 </source>
         <translation>完成以下本地目录的同步：
 </translation>
     </message>
     <message>
         <location filename="../utils.cpp" line="87"/>
-        <source>Synchronization of the following directories on %1 complete:
+        <source>Synchronization of the following folders on %1 complete:
 </source>
         <translation>完成以下目录在 %1 上的同步：
 </translation>

syncthingconnector/utils.cpp

@@ -73,7 +73,7 @@ QString syncCompleteString(const std::vector<const SyncthingDir *> &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<const SyncthingDir *> &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(", "));
 }
 

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");
             }

syncthingmodel/translations/syncthingmodel_cs_CZ.ts

@@ -393,7 +393,7 @@
     </message>
     <message>
         <location filename="../syncthingrecentchangesmodel.cpp" line="75"/>
-        <source>Directory</source>
+        <source>Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

syncthingmodel/translations/syncthingmodel_de_DE.ts

@@ -391,7 +391,7 @@
     </message>
     <message>
         <location filename="../syncthingrecentchangesmodel.cpp" line="75"/>
-        <source>Directory</source>
+        <source>Folder</source>
         <translation>Verzeichnis</translation>
     </message>
     <message>

syncthingmodel/translations/syncthingmodel_en_US.ts

@@ -391,7 +391,7 @@
     </message>
     <message>
         <location filename="../syncthingrecentchangesmodel.cpp" line="75"/>
-        <source>Directory</source>
+        <source>Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

syncthingmodel/translations/syncthingmodel_zh_CN.ts

@@ -389,7 +389,7 @@
     </message>
     <message>
         <location filename="../syncthingrecentchangesmodel.cpp" line="75"/>
-        <source>Directory</source>
+        <source>Folder</source>
         <translation>目录</translation>
     </message>
     <message>

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"));

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)
 {

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:

syncthingwidgets/settings/notificationsoptionpage.ui

@@ -40,14 +40,14 @@
       <item>
        <widget class="QCheckBox" name="notifyOnLocalSyncCompleteCheckBox">
         <property name="text">
-         <string>sync of local directory complete</string>
+         <string>sync of local folder complete</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="notifyOnRemoteSyncCompleteCheckBox">
         <property name="text">
-         <string>sync of remote directory complete</string>
+         <string>sync of remote folder complete</string>
         </property>
        </widget>
       </item>
@@ -61,7 +61,7 @@
       <item>
        <widget class="QCheckBox" name="notifyOnNewDirSharedCheckBox">
         <property name="text">
-         <string>remote device shares new/unknown directory</string>
+         <string>remote device shares new/unknown folder</string>
         </property>
        </widget>
       </item>

syncthingwidgets/translations/syncthingwidgets_cs_CZ.ts

@@ -713,7 +713,7 @@
     </message>
     <message>
         <location filename="../misc/dbusstatusnotifier.cpp" line="30"/>
-        <source> - new directory</source>
+        <source> - new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -800,7 +800,7 @@
     <name>QtGui::DirectoryErrorsDialog</name>
     <message>
         <location filename="../misc/direrrorsdialog.cpp" line="28"/>
-        <source>Errors for directory %1</source>
+        <source>Errors for folder %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1386,12 +1386,12 @@
     </message>
     <message>
         <location filename="../settings/notificationsoptionpage.ui" line="43"/>
-        <source>sync of local directory complete</source>
+        <source>sync of local folder complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../settings/notificationsoptionpage.ui" line="50"/>
-        <source>sync of remote directory complete</source>
+        <source>sync of remote folder complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1401,7 +1401,7 @@
     </message>
     <message>
         <location filename="../settings/notificationsoptionpage.ui" line="64"/>
-        <source>remote device shares new/unknown directory</source>
+        <source>remote device shares new/unknown folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1542,7 +1542,7 @@
     <message>
         <location filename="../misc/statusinfo.cpp" line="63"/>
         <location filename="../misc/statusinfo.cpp" line="67"/>
-        <source>At least one directory is out of sync</source>
+        <source>At least one folder is out of sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1567,7 +1567,7 @@
     </message>
     <message>
         <location filename="../misc/statusinfo.cpp" line="92"/>
-        <source>At least one remote directory is not in sync</source>
+        <source>At least one remote folder is not in sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

syncthingwidgets/translations/syncthingwidgets_de_DE.ts

@@ -857,7 +857,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
     </message>
     <message>
         <location filename="../misc/dbusstatusnotifier.cpp" line="30"/>
-        <source> - new directory</source>
+        <source> - new folder</source>
         <translation>- neues Verzeichnis</translation>
     </message>
     <message>
@@ -952,7 +952,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
     <name>QtGui::DirectoryErrorsDialog</name>
     <message>
         <location filename="../misc/direrrorsdialog.cpp" line="28"/>
-        <source>Errors for directory %1</source>
+        <source>Errors for folder %1</source>
         <translation>Fehler für Verzeichnis %1</translation>
     </message>
     <message>
@@ -1577,12 +1577,12 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
     </message>
     <message>
         <location filename="../settings/notificationsoptionpage.ui" line="43"/>
-        <source>sync of local directory complete</source>
+        <source>sync of local folder complete</source>
         <translation>die Synchronisation lokaler Verzeichnisse abgeschlossen wurde</translation>
     </message>
     <message>
         <location filename="../settings/notificationsoptionpage.ui" line="50"/>
-        <source>sync of remote directory complete</source>
+        <source>sync of remote folder complete</source>
         <translation>die Synchronisation von Verzeichnissen auf anderen Geräten abgeschlossen wurde</translation>
     </message>
     <message>
@@ -1592,7 +1592,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
     </message>
     <message>
         <location filename="../settings/notificationsoptionpage.ui" line="64"/>
-        <source>remote device shares new/unknown directory</source>
+        <source>remote device shares new/unknown folder</source>
         <translation>ein anderes Geräte ein neues/unbekanntes Verzeichnis teilen möchte</translation>
     </message>
     <message>
@@ -1724,7 +1724,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
     <message>
         <location filename="../misc/statusinfo.cpp" line="63"/>
         <location filename="../misc/statusinfo.cpp" line="67"/>
-        <source>At least one directory is out of sync</source>
+        <source>At least one folder is out of sync</source>
         <translation>Mind. ein Verzeichnis hat Fehler</translation>
     </message>
     <message>
@@ -1749,7 +1749,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
     </message>
     <message>
         <location filename="../misc/statusinfo.cpp" line="92"/>
-        <source>At least one remote directory is not in sync</source>
+        <source>At least one remote folder is not in sync</source>
         <translation>Mind. ein entferntes Verzeichnis ist nicht synchronisiert</translation>
     </message>
     <message numerus="yes">

syncthingwidgets/translations/syncthingwidgets_en_US.ts

@@ -713,7 +713,7 @@
     </message>
     <message>
         <location filename="../misc/dbusstatusnotifier.cpp" line="30"/>
-        <source> - new directory</source>
+        <source> - new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -800,7 +800,7 @@
     <name>QtGui::DirectoryErrorsDialog</name>
     <message>
         <location filename="../misc/direrrorsdialog.cpp" line="28"/>
-        <source>Errors for directory %1</source>
+        <source>Errors for folder %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1379,12 +1379,12 @@
     </message>
     <message>
         <location filename="../settings/notificationsoptionpage.ui" line="43"/>
-        <source>sync of local directory complete</source>
+        <source>sync of local folder complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../settings/notificationsoptionpage.ui" line="50"/>
-        <source>sync of remote directory complete</source>
+        <source>sync of remote folder complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1394,7 +1394,7 @@
     </message>
     <message>
         <location filename="../settings/notificationsoptionpage.ui" line="64"/>
-        <source>remote device shares new/unknown directory</source>
+        <source>remote device shares new/unknown folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1514,7 +1514,7 @@
     <message>
         <location filename="../misc/statusinfo.cpp" line="63"/>
         <location filename="../misc/statusinfo.cpp" line="67"/>
-        <source>At least one directory is out of sync</source>
+        <source>At least one folder is out of sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1539,7 +1539,7 @@
     </message>
     <message>
         <location filename="../misc/statusinfo.cpp" line="92"/>
-        <source>At least one remote directory is not in sync</source>
+        <source>At least one remote folder is not in sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">

syncthingwidgets/translations/syncthingwidgets_zh_CN.ts

@@ -731,7 +731,7 @@ The Web UI will be opened in the default web browser instead.</source>
     </message>
     <message>
         <location filename="../misc/dbusstatusnotifier.cpp" line="30"/>
-        <source> - new directory</source>
+        <source> - new folder</source>
         <translation> - 新目录</translation>
     </message>
     <message>
@@ -822,7 +822,7 @@ The Web UI will be opened in the default web browser instead.</source>
     <name>QtGui::DirectoryErrorsDialog</name>
     <message>
         <location filename="../misc/direrrorsdialog.cpp" line="28"/>
-        <source>Errors for directory %1</source>
+        <source>Errors for folder %1</source>
         <translation>目录 %1 的错误</translation>
     </message>
     <message>
@@ -1420,12 +1420,12 @@ The Web UI will be opened in the default web browser instead.</source>
     </message>
     <message>
         <location filename="../settings/notificationsoptionpage.ui" line="43"/>
-        <source>sync of local directory complete</source>
+        <source>sync of local folder complete</source>
         <translation>本地目录同步完成</translation>
     </message>
     <message>
         <location filename="../settings/notificationsoptionpage.ui" line="50"/>
-        <source>sync of remote directory complete</source>
+        <source>sync of remote folder complete</source>
         <translation>远程目录同步完成</translation>
     </message>
     <message>
@@ -1435,7 +1435,7 @@ The Web UI will be opened in the default web browser instead.</source>
     </message>
     <message>
         <location filename="../settings/notificationsoptionpage.ui" line="64"/>
-        <source>remote device shares new/unknown directory</source>
+        <source>remote device shares new/unknown folder</source>
         <translation>远程设备共享新/未知目录</translation>
     </message>
     <message>
@@ -1584,7 +1584,7 @@ The Web UI will be opened in the default web browser instead.</source>
     <message>
         <location filename="../misc/statusinfo.cpp" line="63"/>
         <location filename="../misc/statusinfo.cpp" line="67"/>
-        <source>At least one directory is out of sync</source>
+        <source>At least one folder is out of sync</source>
         <translation>至少有一个目录未同步</translation>
     </message>
     <message>
@@ -1609,7 +1609,7 @@ The Web UI will be opened in the default web browser instead.</source>
     </message>
     <message>
         <location filename="../misc/statusinfo.cpp" line="92"/>
-        <source>At least one remote directory is not in sync</source>
+        <source>At least one remote folder is not in sync</source>
         <translation>至少有一个远程目录未同步</translation>
     </message>
     <message>

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);
     }
 }
 

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 <i>%1</i> does not exist on the local machine.").arg(path));
+        QMessageBox::warning(this, QCoreApplication::applicationName(), tr("The folder <i>%1</i> 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 <i>%1</i> does not exist on the local machine.").arg(item.fileInfo.filePath()));
+            tr("The containing folder <i>%1</i> 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);
 }

tray/gui/traywidget.ui

@@ -385,7 +385,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</string>
         <normaloff>folder.fa</normaloff>folder.fa</iconset>
       </attribute>
       <attribute name="title">
-       <string>Directories</string>
+       <string>Folders</string>
       </attribute>
       <layout class="QVBoxLayout" name="dirsTabVerticalLayout">
        <property name="spacing">

tray/translations/syncthingtray_cs_CZ.ts

@@ -134,7 +134,7 @@
     </message>
     <message>
         <location filename="../gui/trayicon.cpp" line="296"/>
-        <source>New Syncthing directory - click for web UI</source>
+        <source>New Syncthing folder - click for web UI</source>
         <translation>Nový Syncthing adresář – klikněte pro webové rozhraní</translation>
     </message>
     <message>
@@ -253,7 +253,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.ui" line="388"/>
-        <source>Directories</source>
+        <source>Folders</source>
         <translation>Adresáře</translation>
     </message>
     <message>
@@ -298,7 +298,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="142"/>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation>Znovu proskenovat všechny složky</translation>
     </message>
     <message>
@@ -368,12 +368,12 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="663"/>
-        <source>The directory &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
+        <source>The folder &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
         <translation>Adresář &lt;i&gt;%1&lt;/i&gt; neexistuje místně.</translation>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="674"/>
-        <source>The containing directory &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
+        <source>The containing folder &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
         <translation>Obsažený adresář &lt;i&gt;%1&lt;/i&gt; neexistuje místně.</translation>
     </message>
     <message>
@@ -388,7 +388,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="724"/>
-        <source>Copy directory ID</source>
+        <source>Copy folder ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

tray/translations/syncthingtray_de_DE.ts

@@ -134,7 +134,7 @@
     </message>
     <message>
         <location filename="../gui/trayicon.cpp" line="296"/>
-        <source>New Syncthing directory - click for web UI</source>
+        <source>New Syncthing folder - click for web UI</source>
         <translation>Neues Syncthing-Verzeichnis</translation>
     </message>
     <message>
@@ -257,7 +257,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.ui" line="388"/>
-        <source>Directories</source>
+        <source>Folders</source>
         <translation>Verzeichnisse</translation>
     </message>
     <message>
@@ -303,7 +303,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="142"/>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation>Alle Verzeichnisse neu scannen</translation>
     </message>
     <message>
@@ -373,12 +373,12 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="663"/>
-        <source>The directory &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
+        <source>The folder &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
         <translation>Das Verzeichnis &lt;i&gt;%1&lt;/i&gt; existiert nicht lokal.</translation>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="674"/>
-        <source>The containing directory &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
+        <source>The containing folder &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
         <translation>Das beinhaltende Verzeichnis &lt;i&gt;%1&lt;/i&gt; existiert nicht lokal.</translation>
     </message>
     <message>
@@ -393,7 +393,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="724"/>
-        <source>Copy directory ID</source>
+        <source>Copy folder ID</source>
         <translation>Verzeichnis-ID kopieren</translation>
     </message>
     <message>

tray/translations/syncthingtray_en_US.ts

@@ -144,7 +144,7 @@
     </message>
     <message>
         <location filename="../gui/trayicon.cpp" line="296"/>
-        <source>New Syncthing directory - click for web UI</source>
+        <source>New Syncthing folder - click for web UI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -252,7 +252,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.ui" line="388"/>
-        <source>Directories</source>
+        <source>Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -297,7 +297,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="142"/>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -367,12 +367,12 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="663"/>
-        <source>The directory &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
+        <source>The folder &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="674"/>
-        <source>The containing directory &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
+        <source>The containing folder &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -387,7 +387,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="724"/>
-        <source>Copy directory ID</source>
+        <source>Copy folder ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

tray/translations/syncthingtray_zh_CN.ts

@@ -149,7 +149,7 @@
     </message>
     <message>
         <location filename="../gui/trayicon.cpp" line="296"/>
-        <source>New Syncthing directory - click for web UI</source>
+        <source>New Syncthing folder - click for web UI</source>
         <translation>新 Syncthing 目录 - 点击打开网页 UI</translation>
     </message>
 </context>
@@ -253,7 +253,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.ui" line="388"/>
-        <source>Directories</source>
+        <source>Folders</source>
         <translation>目录</translation>
     </message>
     <message>
@@ -298,7 +298,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="142"/>
-        <source>Rescan all directories</source>
+        <source>Rescan all folders</source>
         <translation>重新扫描全部目录</translation>
     </message>
     <message>
@@ -368,12 +368,12 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="663"/>
-        <source>The directory &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
+        <source>The folder &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
         <translation>本地设备上不存在目录 &lt;i&gt;%1&lt;/i&gt;。</translation>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="674"/>
-        <source>The containing directory &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
+        <source>The containing folder &lt;i&gt;%1&lt;/i&gt; does not exist on the local machine.</source>
         <translation>本地设备上不存在包含目录 &lt;i&gt;%1&lt;/i&gt;。</translation>
     </message>
     <message>
@@ -388,7 +388,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
     </message>
     <message>
         <location filename="../gui/traywidget.cpp" line="724"/>
-        <source>Copy directory ID</source>
+        <source>Copy folder ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>