fix: adjust command line size to allow expanding

OpenClipboard() can fail transiently when another process holds the
clipboard mutex. Add a retry loop (5 attempts, 5ms delay) so that
Deskflow handles brief contention gracefully instead of immediately
failing.

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,18 @@
+# Deskflow Code of Conduct
+
+## Our Pledge
+
+We want the Deskflow community to be one where everyone can work together. We pledge to keep our community focused on the project and the code around the project. 
+
+## Community Standards
+
+ * Keep interactions respectful and focused on the project
+ * Contributions are expected to follow the [contribution guide](https://github.com/deskflow/deskflow/wiki/Contributing).
+ 
+## Enforcement
+
+Enforcement will be done at the descression of the Deskflow Moderators.
+
+ 1. Warning
+ 2. Temporary ban
+ 3. Permanent banning

.github/README.md

@@ -184,4 +184,4 @@ Deskflow is made by possible by these contributors.
 
 ## License
 
-This project is licensed under [GPL-2.0](LICENSE) with an [OpenSSL exception](LICENSES/LicenseRef-OpenSSL-Exception.txt).
+This project is licensed under [GPL-2.0](LICENSE) with an [OpenSSL exception](../LICENSES/LicenseRef-OpenSSL-Exception.txt).

.github/actions/add-kitware-repo/action.yml

@@ -1,34 +0,0 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-License-Identifier: MIT
-
-name: "Add Kitware repo"
-description: "Add Kitware repo for Debian-like distros"
-
-inputs:
-  distro:
-    description: "Ubuntu codename, Kitware uses: noble, jammy, focal"
-    required: true
-
-runs:
-  using: "composite"
-
-  steps:
-
-    # This mirrors instructions at https://apt.kitware.com
-    - name: Add repo
-      run: |
-          apt update -y -qqq
-          apt install ca-certificates gpg wget -y -qqq
-
-          wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
-            | gpg --dearmor - \
-            > /usr/share/keyrings/kitware-archive-keyring.gpg
-
-          echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ ${{ inputs.distro }} main' \
-            > /etc/apt/sources.list.d/kitware.list
-            
-          apt update -y -qqq
-      env:
-          # Prevent apt prompting for input.
-          DEBIAN_FRONTEND: noninteractive
-      shell: bash

.github/actions/install-dependencies/action.yml

@@ -30,7 +30,7 @@ runs:
       if: ${{ runner.os != 'Windows' }}
       run: |
           if [ "$RUNNER_OS" == "macOS" ]; then
-            brew install googletest openssl --quiet
+            brew install googletest openssl doxygen --quiet
           elif [ "$RUNNER_OS" == "Linux" ]; then
             if [ ${{inputs.like}} == "debian" ]; then
               apt update -qqq > /dev/null
@@ -38,17 +38,17 @@ runs:
                 xorg-dev libx11-dev libxtst-dev libssl-dev \
                 libglib2.0-dev libxkbfile-dev qt6-base-dev qt6-tools-dev \
                 libgtk-3-dev libgtest-dev libgmock-dev \
-                libei-dev libportal-dev help2man -y >/dev/null
+                libei-dev libportal-dev help2man doxygen -y >/dev/null
             elif [ ${{inputs.like}} == "fedora" ]; then
               dnf install -y cmake make ninja-build gcc-c++ rpm-build openssl-devel \
                 glib2-devel libXtst-devel libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \
-                gtk3-devel gtest-devel gmock-devel libei-devel libportal-devel help2man
+                gtk3-devel gtest-devel gmock-devel libei-devel libportal-devel help2man doxygen
             elif [ ${{inputs.like}} == "suse" ]; then
               zypper refresh
               zypper install -y --force-resolution \
                 cmake make ninja gcc-c++ rpm-build libopenssl-devel \
                 glib2-devel libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel \
-                qt6-linguist-devel gtk3-devel \
+                qt6-linguist-devel gtk3-devel doxygen \
                 googletest-devel googlemock-devel libei-devel libportal-devel help2man
             elif [ ${{ inputs.like }} == "arch" ]; then
               pacman -Syu --noconfirm base-devel cmake ninja \
@@ -83,6 +83,22 @@ runs:
         token: ${{ github.token }}
         revision: master
 
+    - name: Cache Chocolatey
+      id: cache-choco
+      if: (runner.os == 'Windows')
+      uses: actions/cache@v4
+      with:
+        path: |
+            C:/ProgramData/chocolatey/bin/
+            C:/ProgramData/chocolatey/lib/doxygen.install
+            C:/Program*/doxygen/
+        key: cache-chocolatey${{ matrix.config.arch }}-doxygen
+
+    - name: Install doxygen (windows)
+      if: ((runner.os == 'Windows') && (steps.cache-choco.outputs.cache-hit != 'true'))
+      shell: bash
+      run: choco install doxygen.install
+
     - name: Install Wix
       if: ${{ runner.os == 'Windows' }}
       run: |
@@ -91,3 +107,4 @@ runs:
         wix extension add --global WixToolset.Util.wixext/5.0.2
         wix extension add --global WixToolset.Firewall.wixext/5.0.2
       shell: pwsh
+

.github/actions/winget-publish/action.yaml

@@ -1,33 +0,0 @@
-name: Winget Publish
-description: A composite action to publish packages to the Windows Package Manager (Winget) repository
-
-inputs:
-  release-version:
-    description: "Version to publish to Winget package manager (without 'v' prefix)"
-    required: true
-  token:
-    description: "GitHub token with public read permissions on the source repo"
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: Submit package to Windows Package Manager Community Repository
-      if: ${{ runner.os == 'Windows' }}
-      env:
-        GITHUB_TOKEN: ${{ inputs.token }}
-      run: |
-        # Download latest wingetcreate
-        Invoke-WebRequest https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
-        
-        $packageId = "Deskflow.Deskflow"
-        $x64Url = "https://github.com/deskflow/deskflow/releases/download/v${{ inputs.release-version }}/deskflow-${{ inputs.release-version }}-win-x64.msi"
-        $arm64Url = "https://github.com/deskflow/deskflow/releases/download/v${{ inputs.release-version }}/deskflow-${{ inputs.release-version }}-win-arm64.msi"
-
-        # Submit package update
-        .\wingetcreate.exe update "$packageId" `
-          --version "${{ inputs.release-version }}" `
-          --urls "$x64Url|x64" "$arm64Url|arm64"`
-          --submit `
-          --token "${{ inputs.token }}"
-      shell: pwsh

.github/workflows/continuous-integration.yml

@@ -99,7 +99,7 @@ jobs:
             config-args: "-G Ninja"
             vcpkg-triplet: x64-windows-release
             arch: "amd64"
-            qt-version: 6.10.1
+            qt-version: 6.10.2
 
           - name: "windows-2022-arm64"
             runs-on: "windows-11-arm"
@@ -107,12 +107,12 @@ jobs:
             config-args: "-G Ninja"
             vcpkg-triplet: arm64-windows
             arch: "arm64"
-            qt-version: 6.10.1
+            qt-version: 6.10.2
 
           - name: "macos-arm64"
             runs-on: macos-15
             timeout: 10
-            qt-version: 6.10.1
+            qt-version: 6.10.2
             config-args: '-DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=14 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
 
           - name: "macos-x64"
@@ -268,6 +268,11 @@ jobs:
       - name: Get version
         uses: ./.github/actions/get-version
 
+      - name: Update Windows Paths
+        if: (runner.os == 'Windows')
+        shell: pwsh
+        run: echo "C:\Program Files\doxygen\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
       - name: Configure
         run: ${{env.CMAKE_CONFIGURE}} ${{ matrix.target.config-args }} ${{ steps.get-deps.outputs.vcpkg-cmake-config }} -DPACKAGE_VERSION_LABEL="${{env.DESKFLOW_PACKAGE_VERSION}}"
 
@@ -275,7 +280,21 @@ jobs:
         shell: bash
         run: |
           if [[ "${{matrix.target.like}}" != "arch" ]]; then
+            if [ "$RUNNER_OS" != "macOS" ]; then
               cmake --build build --config Release -j8 --target package
+            else
+              cmake --build build --config Release -j8
+              for i in $(seq 1 5); do
+                cmake --build build --config Release -j8 --target package 2>&1
+                if [ $? -eq 0 ]; then
+                  echo "Package successful"
+                  break
+                else
+                  echo "Package attempt $i failed"
+                  sleep 1
+                fi
+              done
+            fi
           else
             cmake --build build --config Release -j8
             useradd -m build
@@ -312,7 +331,7 @@ jobs:
         uses: JamesIves/github-pages-deploy-action@v4.7.3
         with:
           branch: gh-pages
-          folder: build/doc/dev/html
+          folder: build/docs/dev/html
 
       - name: Upload
         uses: actions/upload-artifact@v4
@@ -347,7 +366,7 @@ jobs:
           run: |
             pkg install -y cmake ninja gmake gcc12 openssl glib \
             libX11 libXtst libxkbfile qt6-base qt6-tools gtk3 \
-            googletest pkgconf libei libportal
+            googletest pkgconf libei libportal doxygen
             ${{env.CMAKE_CONFIGURE}} -G Ninja
             cmake --build build -j16
             # Integration tests are flakey by nature, make them optional.
@@ -457,20 +476,3 @@ jobs:
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/deskflow/homebrew-tap/dispatches \
           -d '{"event_type":"update_tap"}'
-
-  winget-publish:
-    needs: release
-    if: contains(github.ref, 'tags/v')
-    runs-on: windows-latest
-    steps:
-      - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v2
-
-      - name: Get version
-        uses: ./.github/actions/get-version
-
-      - name: Submit
-        uses: ./.github/actions/winget-publish
-        with:
-          release-version: ${{env.DESKFLOW_PACKAGE_VERSION}}
-          token: ${{ secrets.WINGET_DEPLOY_TOKEN }}

CMakeLists.txt

@@ -99,11 +99,10 @@ message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
 # Set lib versions
 set(REQUIRED_OPENSSL_VERSION 3.0)
 set(REQUIRED_LIBEI_VERSION 1.3)
-set(REQUIRED_LIBPORTAL_VERSION 0.8)
+set(REQUIRED_LIBPORTAL_VERSION 0.9.1)
 set(REQUIRED_QT_VERSION 6.7.0)
 
 if (WIN32)
-  add_definitions(-DSYSAPI_WIN32 -DWINAPI_MSWINDOWS)
   # VSCMD_ARG_TGT_ARCH is set on CI
   if ("$ENV{VSCMD_ARG_TGT_ARCH}" STREQUAL "")
     # NOT on CI
@@ -162,11 +161,16 @@ endif()
 include(cmake/Libraries.cmake)
 configure_libs()
 
+if(BUILD_OSX_BUNDLE AND APPLE_CODESIGN_DEV)
+  include(cmake/MacCodesign.cmake)
+endif()
+
 # setup install paths
 include(GNUInstallDirs)
 if (WIN32)
   set(CMAKE_INSTALL_BINDIR .)
   set(CMAKE_INSTALL_LIBDIR .)
+  set(CMAKE_INSTALL_DOCDIR docs)
   set(CMAKE_INSTALL_LICENSE_DIR .)
   set(CMAKE_INSTALL_I18N_DIR translations)
 elseif(BUILD_OSX_BUNDLE)
@@ -177,7 +181,7 @@ else()
   set(CMAKE_INSTALL_I18N_DIR ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/translations)
 endif()
 
-add_subdirectory(doc)
+add_subdirectory(docs)
 
 # build translations before source, I18N unit tests fail if they are missing
 add_subdirectory(translations)

REUSE.toml

@@ -17,7 +17,7 @@ path = [
  , "sonar-project.properties"
  , "cmake/vcpkg.json.in"
  , "**/*.md"
- , "doc/**"
+ , "docs/**"
  , "deploy/linux/flatpak/**"
  , "deploy/linux/org.deskflow.deskflow.metainfo.xml"
  , "deploy/windows/wix-patch.xml.in"

cmake/Libraries.cmake

@@ -141,8 +141,6 @@ macro(configure_unix_libs)
       ${lib_ScreenSaver} ${lib_IOKit} ${lib_ApplicationServices}
       ${lib_Foundation} ${lib_Carbon} ${lib_UserNotifications}
     )
-
-    add_definitions(-DWINAPI_CARBON=1)
   else()
 
     if (BUILD_X11_SUPPORT)
@@ -163,9 +161,6 @@ macro(configure_unix_libs)
       message(WARNING "pkg-config not found, skipping wayland libraries")
     endif()
   endif()
-
-  add_definitions(-DSYSAPI_UNIX=1)
-
 endmacro()
 
 #

cmake/MacCodesign.cmake

@@ -0,0 +1,51 @@
+# SPDX-FileCopyrightText: (C) 2025-2026 Deskflow Contributors
+# SPDX-License-Identifier: MIT
+
+# Warning: Do not use for CI/production, as the `entitlements-dev.plist` file adds special
+# entitlements that are only appropriate for local development.
+#
+# macOS made TCC stricter so that if you don't sign your local dev builds properly, macOS will
+# nag you to remove and re-approve the app every time you make a change to the binary which is
+# extremely annoying during development.
+#
+# If you were to use ad-hoc signing (i.e. not specify a certificate), TCC would still nag you
+# because the binary identity is anchored not on the app ID, but on the CD hash (which changes
+# based on the binary contents).
+#
+# To use, simply generate a personal certificate for free with Xcode and pass the ID to CMake.
+# Full instructions are in the docs.
+
+function(configure_mac_codesign target)
+  set_property(GLOBAL APPEND PROPERTY _MAC_CODESIGN_DEPENDS $<TARGET_FILE:${target}>)
+
+  get_property(deferred GLOBAL PROPERTY _MAC_CODESIGN_DEFERRED)
+
+  if(NOT deferred)
+    set_property(GLOBAL PROPERTY _MAC_CODESIGN_DEFERRED TRUE)
+    message(STATUS "Apple codesign ID for development only: ${APPLE_CODESIGN_DEV}")
+    cmake_language(DEFER DIRECTORY ${CMAKE_SOURCE_DIR} CALL _finalize_mac_codesign)
+  endif()
+endfunction()
+
+function(_finalize_mac_codesign)
+  get_property(depends GLOBAL PROPERTY _MAC_CODESIGN_DEPENDS)
+
+  set(stamp_file "${CMAKE_BINARY_DIR}/CMakeFiles/codesign-dev.stamp")
+
+  # Use a stamp file because codesign modifies the binaries it signs.
+  add_custom_command(
+    OUTPUT ${stamp_file}
+    COMMAND /usr/bin/codesign
+            --force
+            --options runtime
+            --entitlements "${CMAKE_SOURCE_DIR}/src/apps/res/entitlements-dev.plist"
+            --sign "${APPLE_CODESIGN_DEV}"
+            "$<TARGET_BUNDLE_DIR:${CMAKE_PROJECT_PROPER_NAME}>"
+    COMMAND ${CMAKE_COMMAND} -E touch ${stamp_file}
+    DEPENDS ${depends}
+    COMMENT "Codesigning ${CMAKE_PROJECT_PROPER_NAME}"
+    VERBATIM
+  )
+
+  add_custom_target(codesign-dev ALL DEPENDS ${stamp_file})
+endfunction()

docs/CMakeLists.txt

@@ -24,3 +24,12 @@ if (DOXYGEN_FOUND)
 else()
   message(STATUS "Doxygen not found, skipping docs build")
 endif()
+
+# Show our documents in the IDE
+add_custom_target(docs
+  SOURCES
+    Readme.md
+    Security.md
+)
+
+install(FILES Security.md Readme.md DESTINATION ${CMAKE_INSTALL_DOCDIR})

docs/Readme.md

@@ -0,0 +1,18 @@
+# Deskflow
+
+Deskflow is a free and open source keyboard and mouse sharing app. Use the keyboard, mouse, or trackpad of one computer to control nearby computers, and work seamlessly between them.
+
+[Homepage](https://deskflow.org) [Code](https://github.com/deskflow/deskflo)
+
+## Getting help online
+
+ - View the [wiki](https://github.com/deskflow/deskflow/wiki) Online resource
+
+### Chat with us
+ - Main discussion on Matrix: [`#deskflow:matrix.org`](https://matrix.to/#/#deskflow:matrix.org) ([Matrix clients](https://matrix.org/ecosystem/clients/))
+ - Discussion also happens on IRC: `#deskflow` or `#deskflow-dev` on [Libera Chat](https://libera.chat/)
+ - Start a [new discussion](https://github.com/deskflow/deskflow/discussions) on our GitHub project.
+
+## Reporting security issues
+
+Check [Security](Security.md) to find out how to report security issues.

docs/dev/build.md

@@ -4,7 +4,7 @@ To build Deskflow you will a minimum of:
     - [cmake] 3.24+
     - [Qt] 6.7.0+
     - [openssl] 3.0+
-    - [libportal] 0.8+ (linux, bsd)
+    - [libportal] 0.9.1+ (linux, bsd)
     - [libei] 1.3+ (linux, bsd)
     - [google_test] ^
 

docs/user/CMakeLists.txt

@@ -16,5 +16,4 @@ target_sources(user-docs PRIVATE
 install(
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html"
   DESTINATION ${CMAKE_INSTALL_DOCDIR}
-  COMPONENT deskflow_user_docs
 )

docs/user/configuration.md

@@ -50,14 +50,14 @@ option=value
 This section contains options used when in client mode. 
 It will begin with `[client]`
 
-
 | Option            |    Valid Values    | Description |
-|:----------------------|:------------------:|:-----------|
+|:------------------|:------------------:|:-----------|
-| binary                | Filename           | The filename of the binary to call for client mode. This binary exists in the same path as the GUI |
-| invertScrollDirection | `true` or `false`  | Invert scroll on this client [default: false] |
 | languageSync      | `true` or `false`  | Sync to server language [default: true] |
-| remoteHost            | `IP` or `hostname` | The remote host(s) to connect to. Use a comma seperated list when you want to try severial hosts |
+| remoteHost        | `IP` or `hostname` | The remote host(s) to connect to. Use a comma separated list when you want to try several hosts |
-| yScrollScale          | Double 0.1 - 10.0  | Mouse scrolling will be scaled by this amount on the client [default: 1.0] |
+| yScrollScale      | Double 0.1 - 10.0  | Vertical mouse scrolling will be scaled by this amount on the client [default: 1.0] |
+| xScrollScale      | Double 0.1 - 10.0  | Horizontal mouse scrolling will be scaled by this amount on the client [default: 1.0] |
+| invertYScroll     | `true` or `false`  | Invert vertical scroll on this client [default: false] |
+| invertXScroll     | `true` or `false`  | Invert horizontal scroll on this client [default: false] |
 | xdpRestoreToken   | UUID               | Restore token provided by XDG portals |
 
 ### Core
@@ -77,6 +77,10 @@ This section contains general options it will begin with `[core]`
 | useHooks      | `true` or `false` | If Windows uses hooks or not [default: true] |
 | language      | 639 language      | The language to display the GUI in [default: en] |
 | wlClipboard   | `true` or `false` | When true the wl-clipboard backend will be enabled [default: false] |
+| enableEnterCommand | `true` or `false` | Should the enter command be triggered when the screen is entered [defaut: false] |
+| enterCommand  | command | A command to run when the screen is entered. |
+| enableExitCommand | `true` or `false` | Should the exit command be triggered when the screen is exited [defaut: false] |
+| exitCommand  | command | A command to run when the screen is exited. |
 
 ### Daemon
 

src/apps/deskflow-core/CMakeLists.txt

@@ -50,6 +50,9 @@ if(BUILD_OSX_BUNDLE)
     INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
     RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS
   )
+  if (APPLE_CODESIGN_DEV)
+    configure_mac_codesign(${target})
+  endif()
 elseif (WIN32)
   install(RUNTIME_DEPENDENCY_SET coreDeps
     PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}

src/apps/deskflow-core/deskflow-core.cpp

@@ -16,7 +16,7 @@
 #include "deskflow/ClientApp.h"
 #include "deskflow/ServerApp.h"
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 #include "arch/win32/ArchMiscWindows.h"
 #include <QCoreApplication>
 #endif
@@ -32,7 +32,7 @@ void showHelp(const CoreArgParser &parser)
 
 int main(int argc, char **argv)
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   // HACK to make sure settings gets the correct qApp path
   QCoreApplication m(argc, argv);
   m.deleteLater();

src/apps/deskflow-daemon/DaemonApp.cpp

@@ -15,8 +15,7 @@
 #include "common/Settings.h"
 #include "deskflow/ipc/DaemonIpcServer.h"
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
-
 #include "arch/win32/ArchDaemonWindows.h"
 #include "deskflow/Screen.h"
 #include "platform/MSWindowsDebugOutputter.h"
@@ -64,7 +63,7 @@ void DaemonApp::applyWatchdogCommand() const
 {
   LOG_DEBUG("applying watchdog command");
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   m_pWatchdog->setProcessConfig(m_command, m_elevate);
 #else
   LOG_ERR("applying watchdog command not implemented on this platform");
@@ -78,7 +77,7 @@ void DaemonApp::clearWatchdogCommand()
   // Clear the setting to prevent it from being next time the daemon starts.
   setCommand("");
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   m_pWatchdog->setProcessConfig("", false);
 #else
   LOG_ERR("clearing watchdog command not implemented on this platform");
@@ -137,7 +136,7 @@ void DaemonApp::run(QThread &daemonThread)
     LOG_DEBUG("daemon thread finished");
   });
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   m_pWatchdog = std::make_unique<MSWindowsWatchdog>(m_foreground, *m_pFileLogOutputter);
 
   auto command = Settings::value(Settings::Daemon::Command).toString().toStdString();
@@ -154,17 +153,17 @@ void DaemonApp::run(QThread &daemonThread)
 
 int DaemonApp::daemonLoop()
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   // Runs the daemon through the Windows service controller, which controls the program lifecycle.
   return ArchDaemonWindows::runDaemon([this]() { return mainLoop(); });
-#elif SYSAPI_UNIX
+#else
   return mainLoop();
 #endif
 }
 
 int DaemonApp::mainLoop()
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   if (m_pWatchdog == nullptr) {
     LOG_ERR("watchdog not initialized");
     return s_exitFailed;
@@ -173,7 +172,7 @@ int DaemonApp::mainLoop()
 #endif
 
   try {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
     // Install the platform event queue to handle service stop events.
     // This must be done on the same thread as the event loop, otherwise the service stop
     // request will not add the quit event to the event queue, and the service won't stop.
@@ -193,7 +192,7 @@ int DaemonApp::mainLoop()
 
   LOG_INFO("daemon is stopping");
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   try {
     LOG_DEBUG("stopping process watchdog");
     m_pWatchdog->stop();
@@ -221,7 +220,7 @@ void DaemonApp::setForeground()
 
 void DaemonApp::initLogging()
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   if (!m_foreground) {
     // Only use MS debug outputter when the process is daemonized, since stdout won't be accessible
     // in that case, but is accessible when running in the foreground.
@@ -235,7 +234,7 @@ void DaemonApp::initLogging()
 
 void DaemonApp::showConsole()
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   // The daemon bin is compiled using the Win32 subsystem which works best for Windows services,
   // so when running as a foreground process we need to allocate a console (or we won't see output).
   // It is important to do this inside the arg check loop so that we can attach console ahead

src/apps/deskflow-daemon/DaemonApp.h

@@ -21,7 +21,7 @@ namespace deskflow::core::ipc {
 class DaemonIpcServer;
 }
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 class MSWindowsWatchdog;
 #endif
 
@@ -56,7 +56,7 @@ private:
 
   static void showConsole();
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   std::unique_ptr<MSWindowsWatchdog> m_pWatchdog;
 #endif
 

src/apps/deskflow-daemon/deskflow-daemon.cpp

@@ -15,13 +15,11 @@
 #include "common/VersionInfo.h"
 #include "deskflow/ipc/DaemonIpcServer.h"
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
-
 #include "arch/win32/ArchMiscWindows.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
-
 #endif
 
 #include <QCommandLineParser>
@@ -34,7 +32,7 @@ void handleError(const char *message = "Unrecognized error.");
 
 int main(int argc, char **argv)
 {
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   ArchMiscWindows::guardRuntimeVersion();
 
   // Save window instance for later use, e.g. `GetModuleFileName` which is used when installing the daemon.
@@ -85,7 +83,7 @@ int main(int argc, char **argv)
 
   try {
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
     // Show warning if not running as admin as daemon will behave differently.
     if (!ArchMiscWindows::isProcessElevated()) {
       LOG_WARN("not running as admin, some features may not work");
@@ -115,8 +113,7 @@ int main(int argc, char **argv)
   }
 }
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
-
 // Win32 subsystem entry point (simply forwards to main).
 // We need this because using regular main under the Win32 subsystem results in empty args.
 int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
@@ -131,7 +128,7 @@ void handleError(const char *message)
   // Always print error to stdout in case run as CLI program.
   LOG_ERR("%s", message);
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   // Show a message box for when run from MSI in Win32 subsystem.
   MessageBoxA(nullptr, message, "Deskflow daemon error", MB_OK | MB_ICONERROR);
 #endif

src/apps/deskflow-gui/CMakeLists.txt

@@ -95,32 +95,8 @@ elseif(APPLE)
       INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
       MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/deskflow.plist"
     )
-
+    if (APPLE_CODESIGN_DEV)
-    # Warning: Do not use for CI/production, as the `entitlements-dev.plist` file adds special
+      configure_mac_codesign(${target})
-    # entitlements that are only appropriate for local development.
-    #
-    # macOS made TCC stricter so that if you don't sign your local dev builds properly, macOS will
-    # nag you to remove and re-approve the app every time you make a change to the binary which is
-    # extremely annoying during development.
-    #
-    # If you were to use ad-hoc signing (i.e. not specify a certificate), TCC would still nag you
-    # because the binary identity is anchored not on the app ID, but on the CD hash (which changes
-    # based on the binary contents).
-    #
-    # To use, simply generate a personal certificate for free with Xcode and pass the ID to CMake.
-    # Full instructions are in the docs.
-    if (NOT "${APPLE_CODESIGN_DEV}" STREQUAL "")
-      message(STATUS "Apple codesign ID for development only: ${APPLE_CODESIGN_DEV}")
-      add_custom_command(
-        TARGET ${target} POST_BUILD
-        COMMAND /usr/bin/codesign
-                --force
-                --options runtime
-                --entitlements "$<SHELL_PATH:${CMAKE_SOURCE_DIR}/src/apps/res/entitlements-dev.plist>"
-                --sign "${APPLE_CODESIGN_DEV}"
-                "$<TARGET_BUNDLE_DIR:${target}>"
-        VERBATIM
-      )
     endif()
   else()
     set_target_properties(${target} PROPERTIES MACOSX_BUNDLE FALSE)

src/apps/deskflow-gui/deskflow-gui.cpp

@@ -32,7 +32,7 @@
 #include <QLoggingCategory>
 #endif
 
-#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
+#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN)
 #include "platform/XDGPortalRegistry.h"
 #endif
 
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
   QLoggingCategory::setFilterRules(QStringLiteral("*.debug=true\nqt.*=false"));
 #endif
 
-#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
+#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN)
   deskflow::platform::setAppId();
 #endif
 

src/lib/arch/Arch.cpp

@@ -10,7 +10,7 @@
 
 #include <thread>
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 #include "arch/win32/ArchMiscWindows.h"
 #endif
 
@@ -26,7 +26,7 @@ Arch::Arch()
   s_instance = this;
 }
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 void Arch::init()
 {
   ARCH_NETWORK::init();

src/lib/arch/Arch.h

@@ -5,7 +5,7 @@
  * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
-
+#include <QtSystemDetection>
 // Consider whether or not to use either encapsulation (as below)
 // or inheritance (as it is now) for the ARCH stuff.
 //
@@ -25,20 +25,16 @@
 
 #pragma once
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
-
 #include "arch/win32/ArchDaemonWindows.h"
 #include "arch/win32/ArchLogWindows.h"
 #include "arch/win32/ArchMultithreadWindows.h"
 #include "arch/win32/ArchNetworkWinsock.h"
-
+#else
-#elif SYSAPI_UNIX
-
 #include "arch/ArchDaemonNone.h"
 #include "arch/unix/ArchLogUnix.h"
 #include "arch/unix/ArchMultithreadPosix.h"
 #include "arch/unix/ArchNetworkBSD.h"
-
 #endif
 
 /*!
@@ -63,7 +59,7 @@ public:
   Arch();
   ~Arch() override = default;
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   //! Call init on other arch classes.
   /*!
   Some arch classes depend on others to exist first. When init is called

src/lib/base/EventTypes.h

@@ -91,6 +91,11 @@ enum class EventTypes : uint32_t
   /// This event is sent whenever a server accepts a client.
   ClientListenerAccepted,
 
+  /**  This event is sent whenever a client disconnects/errors out before the connection
+       is fully accepted.
+  */
+  ClientListenerDisconnectedOnAccept,
+
   /** This event is sent when the client has completed the initial handshake.  Until it is sent,
       the client is not fully connected.
   */

src/lib/common/Enums.h

@@ -21,3 +21,26 @@ enum class ErrorType : uint8_t
 };
 Q_ENUM_NS(ErrorType)
 } // namespace deskflow::client
+
+namespace deskflow::core {
+Q_NAMESPACE
+
+enum class ProcessState
+{
+  Starting,
+  Started,
+  Stopping,
+  Stopped,
+  RetryPending
+};
+Q_ENUM_NS(ProcessState)
+
+enum class ConnectionState
+{
+  Disconnected,
+  Connecting,
+  Connected,
+  Listening
+};
+Q_ENUM_NS(ConnectionState)
+} // namespace deskflow::core

src/lib/common/Settings.cpp

@@ -137,12 +137,11 @@ QString Settings::cleanComputerName(const QString &name)
   static const auto space = QStringLiteral(" ");
   static const auto underscore = QStringLiteral("_");
   static const auto period = QStringLiteral(".");
-  static const auto nothing = QStringLiteral("");
   static const auto nameRegex = QRegularExpression(QStringLiteral("[^\\w\\-\\.]"));
 
   QString cleanName = name.simplified();
   cleanName.replace(space, underscore);
-  cleanName.replace(nameRegex, nothing);
+  cleanName.replace(nameRegex, {});
   while (cleanName.startsWith(hyphen) || cleanName.startsWith(underscore) || cleanName.startsWith(period))
     cleanName.removeFirst();
   while (cleanName.endsWith(hyphen) || cleanName.endsWith(underscore) || cleanName.endsWith(period))
@@ -233,6 +232,18 @@ QStringList Settings::validKeys()
   return Settings::m_validKeys;
 }
 
+QString Settings::serverConfigFile()
+{
+  bool useExt = value(Server::ExternalConfig).toBool();
+  return useExt ? value(Server::ExternalConfigFile).toString() : defaultValue(Server::ExternalConfigFile).toString();
+}
+
+bool Settings::isServerConfigFileReadable()
+{
+  auto file = QFile(serverConfigFile());
+  return file.open(QFile::ReadOnly);
+}
+
 bool Settings::isWritable()
 {
   return instance()->m_settings->isWritable();

src/lib/common/Settings.h

@@ -55,6 +55,10 @@ public:
     inline static const auto UseHooks = QStringLiteral("core/useHooks");
     inline static const auto Language = QStringLiteral("core/language");
     inline static const auto UseWlClipboard = QStringLiteral("core/wlClipboard");
+    inline static const auto EnableEnterCommand = QStringLiteral("core/enableEnterCommand");
+    inline static const auto ScreenEnterCommand = QStringLiteral("core/enterCommand");
+    inline static const auto EnableExitCommand = QStringLiteral("core/enableExitCommand");
+    inline static const auto ScreenExitCommand = QStringLiteral("core/exitCommand");
 
     // TODO: REMOVE In 2.0
     inline static const auto ScreenName = QStringLiteral("core/screenName"); // Replaced By ComputerName
@@ -77,7 +81,6 @@ public:
     inline static const auto LogExpanded = QStringLiteral("gui/logExpanded");
     inline static const auto SymbolicTrayIcon = QStringLiteral("gui/symbolicTrayIcon");
     inline static const auto WindowGeometry = QStringLiteral("gui/windowGeometry");
-    inline static const auto ShowGenericClientFailureDialog = QStringLiteral("gui/showGenericClientFailureDialog");
     inline static const auto ShownFirstConnectedMessage = QStringLiteral("gui/shownFirstConnectedMessage");
     inline static const auto ShownServerFirstStartMessage = QStringLiteral("gui/shownServerFirstStartMessage");
     inline static const auto ShowVersionInTitle = QStringLiteral("gui/showVersionInTitle");
@@ -131,10 +134,12 @@ public:
   static QVariant value(const QString &key = QString());
   static void restoreDefaultSettings();
   static QVariant defaultValue(const QString &key);
+  static bool isServerConfigFileReadable();
   static bool isWritable();
   static bool isPortableMode();
   static QString settingsFile();
   static QString settingsPath();
+  static QString serverConfigFile();
   static QString tlsDir();
   static QString tlsTrustedServersDb();
   static QString tlsTrustedClientsDb();
@@ -206,6 +211,10 @@ private:
     , Settings::Core::Port
     , Settings::Core::PreventSleep
     , Settings::Core::ProcessMode
+    , Settings::Core::EnableEnterCommand
+    , Settings::Core::EnableExitCommand
+    , Settings::Core::ScreenEnterCommand
+    , Settings::Core::ScreenExitCommand
     , Settings::Core::ScreenName
     , Settings::Core::ComputerName
     , Settings::Core::Display
@@ -215,6 +224,7 @@ private:
     , Settings::Daemon::Command
     , Settings::Daemon::Elevate
     , Settings::Daemon::LogFile
+    , Settings::Daemon::LogLevel
     , Settings::Log::File
     , Settings::Log::Level
     , Settings::Log::ToFile
@@ -228,7 +238,6 @@ private:
     , Settings::Gui::LogExpanded
     , Settings::Gui::SymbolicTrayIcon
     , Settings::Gui::WindowGeometry
-    , Settings::Gui::ShowGenericClientFailureDialog
     , Settings::Gui::ShownFirstConnectedMessage
     , Settings::Gui::ShownServerFirstStartMessage
     , Settings::Gui::ShowVersionInTitle
@@ -249,6 +258,8 @@ private:
     , Settings::Gui::ShowVersionInTitle
     , Settings::Core::PreventSleep
     , Settings::Core::UseWlClipboard
+    , Settings::Core::EnableEnterCommand
+    , Settings::Core::EnableExitCommand
     , Settings::Server::ExternalConfig
     , Settings::Client::InvertYScroll
     , Settings::Client::InvertXScroll
@@ -264,7 +275,6 @@ private:
     , Settings::Gui::CloseReminder
     , Settings::Gui::LogExpanded
     , Settings::Gui::SymbolicTrayIcon
-    , Settings::Gui::ShowGenericClientFailureDialog
     , Settings::Security::TlsEnabled
     , Settings::Security::CheckPeers
   };

src/lib/deskflow/App.cpp

@@ -16,13 +16,13 @@
 #include "common/Settings.h"
 #include "deskflow/DeskflowException.h"
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 #include "base/IEventQueue.h"
 #endif
 
 #include <stdexcept>
 
-#if WINAPI_CARBON
+#if defined(Q_OS_MAC)
 #include "platform/OSXCocoaApp.h"
 #include <ApplicationServices/ApplicationServices.h>
 #endif
@@ -151,10 +151,7 @@ void App::handleScreenError() const
 void App::runEventsLoop(const void *)
 {
   m_events->loop();
-
+#if defined(Q_OS_MAC)
-#if WINAPI_CARBON
-
   stopCocoaLoop();
-
 #endif
 }

src/lib/deskflow/App.h

@@ -13,9 +13,9 @@
 #include "deskflow/IApp.h"
 #include "net/SocketMultiplexer.h"
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 #include "deskflow/win32/AppUtilWindows.h"
-#elif SYSAPI_UNIX
+#else
 #include "deskflow/unix/AppUtilUnix.h"
 #endif
 

src/lib/deskflow/ClientApp.cpp

@@ -22,7 +22,7 @@
 #include "net/SocketMultiplexer.h"
 #include "net/TCPSocketFactory.h"
 
-#if WINAPI_MSWINDOWS
+#if defined(Q_OS_WIN)
 #include "platform/MSWindowsScreen.h"
 #endif
 
@@ -36,7 +36,7 @@
 #include "platform/EiScreen.h"
 #endif
 
-#if WINAPI_CARBON
+#if defined(Q_OS_MAC)
 #include "base/TMethodJob.h"
 #include "mt/Thread.h"
 #include "platform/OSXCocoaApp.h"
@@ -104,7 +104,7 @@ const char *ClientApp::daemonName() const
 
 deskflow::Screen *ClientApp::createScreen()
 {
-#if WINAPI_MSWINDOWS
+#if defined(Q_OS_WIN)
   return new deskflow::Screen(
       new MSWindowsScreen(
           false, Settings::value(Settings::Core::UseHooks).toBool(), getEvents(),
@@ -112,9 +112,11 @@ deskflow::Screen *ClientApp::createScreen()
       ),
       getEvents()
   );
-#endif
+#elif defined(Q_OS_MAC)
-
+  return new deskflow::Screen(
-#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
+      new OSXScreen(getEvents(), false, Settings::value(Settings::Client::LanguageSync).toBool()), getEvents()
+  );
+#else
   if (deskflow::platform::isWayland()) {
 #if WINAPI_LIBEI
     LOG_INFO("using ei screen for wayland");
@@ -123,22 +125,14 @@ deskflow::Screen *ClientApp::createScreen()
     throw XNoEiSupport();
 #endif
   }
-#endif
-
 #if WINAPI_XWINDOWS
   LOG_INFO("using legacy x windows screen");
   return new deskflow::Screen(
       new XWindowsScreen(qPrintable(Settings::value(Settings::Core::Display).toString()), false, getEvents()),
       getEvents()
   );
-
-#endif
-
-#if WINAPI_CARBON
-  return new deskflow::Screen(
-      new OSXScreen(getEvents(), false, Settings::value(Settings::Client::LanguageSync).toBool()), getEvents()
-  );
 #endif
+#endif // end os check
 }
 
 deskflow::Screen *ClientApp::openClientScreen()
@@ -332,8 +326,7 @@ int ClientApp::mainLoop()
   // later.  the timer installed by startClient() will take care of
   // that.
 
-#if WINAPI_CARBON
+#if defined(Q_OS_MAC)
-
   Thread thread(new TMethodJob<ClientApp>(this, &ClientApp::runEventsLoop, nullptr));
 
   // wait until carbon loop is ready

src/lib/deskflow/Screen.cpp

@@ -10,6 +10,8 @@
 #include "base/Log.h"
 #include "deskflow/IPlatformScreen.h"
 
+#include <QProcess>
+
 namespace deskflow {
 
 //
@@ -119,6 +121,14 @@ void Screen::enter(KeyModifierMask toggleMask)
   } else {
     enterSecondary(toggleMask);
   }
+
+  if (Settings::value(Settings::Core::EnableEnterCommand).toBool()) {
+    auto args = QProcess::splitCommand(Settings::value(Settings::Core::ScreenEnterCommand).toString());
+    const auto command = args.takeFirst();
+    LOG_DEBUG("running screen enter command: %s %s", qPrintable(command), qPrintable(args.join(" ")));
+    if (!QProcess::startDetached(command, args))
+      LOG_ERR("failed to run screen enter command");
+  }
 }
 
 bool Screen::leave()
@@ -140,6 +150,13 @@ bool Screen::leave()
   }
 
   m_screen->leave();
+  if (Settings::value(Settings::Core::EnableExitCommand).toBool()) {
+    auto args = QProcess::splitCommand(Settings::value(Settings::Core::ScreenExitCommand).toString());
+    const auto command = args.takeFirst();
+    LOG_DEBUG("running screen exit command: %s %s", qPrintable(command), qPrintable(args.join(" ")));
+    if (!QProcess::startDetached(command, args))
+      LOG_ERR("failed to run screen exit command");
+  }
 
   // make sure our idea of clipboard ownership is correct
   m_screen->checkClipboards();

src/lib/deskflow/ServerApp.cpp

@@ -30,7 +30,7 @@
 // must be before screen header includes
 #include <QFileInfo>
 
-#if WINAPI_MSWINDOWS
+#if defined(Q_OS_WIN)
 #include "platform/MSWindowsScreen.h"
 #endif
 
@@ -42,7 +42,7 @@
 #include "platform/EiScreen.h"
 #endif
 
-#if WINAPI_CARBON
+#if defined(Q_OS_MAC)
 #include "base/TMethodJob.h"
 #include "mt/Thread.h"
 #include "platform/OSXCocoaApp.h"
@@ -85,17 +85,10 @@ void ServerApp::reloadSignalHandler(Arch::ThreadSignal, void *)
   events->addEvent(Event(EventTypes::ServerAppReloadConfig, events->getSystemTarget()));
 }
 
-QString ServerApp::currentConfig() const
-{
-  bool useExt = Settings::value(Settings::Server::ExternalConfig).toBool();
-  return useExt ? Settings::value(Settings::Server::ExternalConfigFile).toString()
-                : Settings::defaultValue(Settings::Server::ExternalConfigFile).toString();
-}
-
 void ServerApp::reloadConfig()
 {
   LOG_DEBUG("reload configuration");
-  if (loadConfig(currentConfig())) {
+  if (loadConfig(Settings::serverConfigFile())) {
     if (m_server != nullptr) {
       m_server->setConfig(*m_config);
     }
@@ -105,7 +98,7 @@ void ServerApp::reloadConfig()
 
 void ServerApp::loadConfig()
 {
-  const auto path = currentConfig();
+  const auto path = Settings::serverConfigFile();
   if (path.isEmpty()) {
     LOG_CRIT("no configuration path provided");
     bye(s_exitConfig);
@@ -123,7 +116,7 @@ bool ServerApp::loadConfig(const QString &filename)
   try {
     // load configuration
     LOG_DEBUG("opening configuration \"%s\"", path.c_str());
-#ifdef SYSAPI_WIN32
+#if defined(Q_OS_WIN)
     std::ifstream configStream(filename.toStdWString());
 #else
     std::ifstream configStream(path);
@@ -399,13 +392,13 @@ bool ServerApp::startServer()
 
 deskflow::Screen *ServerApp::createScreen()
 {
-#if WINAPI_MSWINDOWS
+#if defined(Q_OS_WIN)
   return new deskflow::Screen(
       new MSWindowsScreen(true, Settings::value(Settings::Core::UseHooks).toBool(), getEvents()), getEvents()
   );
-#endif
+#elif defined(Q_OS_MAC)
-
+  return new deskflow::Screen(new OSXScreen(getEvents(), true), getEvents());
-#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
+#else
   if (deskflow::platform::isWayland()) {
 #if WINAPI_LIBEI
     LOG_INFO("using ei screen for wayland");
@@ -414,17 +407,14 @@ deskflow::Screen *ServerApp::createScreen()
     throw XNoEiSupport();
 #endif
   }
-#endif
-
 #if WINAPI_XWINDOWS
   LOG_INFO("using legacy x windows screen");
   return new deskflow::Screen(
       new XWindowsScreen(qPrintable(Settings::value(Settings::Core::Display).toString()), true, getEvents()),
       getEvents()
   );
-#elif WINAPI_CARBON
-  return new deskflow::Screen(new OSXScreen(getEvents(), true), getEvents());
 #endif
+#endif // end os check
 }
 
 PrimaryClient *ServerApp::openPrimaryClient(const std::string &name, deskflow::Screen *screen)
@@ -553,7 +543,7 @@ int ServerApp::mainLoop()
   // later.  the timer installed by startServer() will take care of
   // that.
 
-#if WINAPI_CARBON
+#if defined(Q_OS_MAC)
 
   Thread thread(new TMethodJob<ServerApp>(this, &ServerApp::runEventsLoop, nullptr));
 

src/lib/deskflow/ServerApp.h

@@ -106,7 +106,6 @@ private:
   std::unique_ptr<ISocketFactory> getSocketFactory() const;
   NetworkAddress getAddress(const NetworkAddress &address) const;
 
-  QString currentConfig() const;
   bool m_suspended = false;
   Server *m_server = nullptr;
   ServerState m_serverState = ServerState::Uninitialized;

src/lib/deskflow/unix/AppUtilUnix.cpp

@@ -12,7 +12,7 @@
 #if WINAPI_XWINDOWS
 #include "deskflow/unix/X11LayoutsParser.h"
 #include <X11/XKBlib.h>
-#elif WINAPI_CARBON
+#elif defined(Q_OS_MAC)
 #include <Carbon/Carbon.h>
 #include <platform/OSXAutoTypes.h>
 #endif
@@ -50,7 +50,7 @@ std::vector<std::string> AppUtilUnix::getKeyboardLayoutList()
     m_evdev = "/usr/share/X11/xkb/rules/evdev.xml";
   layoutLangCodes = X11LayoutsParser::getX11LanguageList(m_evdev);
 
-#elif WINAPI_CARBON
+#elif defined(Q_OS_MAC)
   CFStringRef keys[] = {kTISPropertyInputSourceCategory};
   CFStringRef values[] = {kTISCategoryKeyboardInputSource};
   AutoCFDictionary dict(
@@ -134,7 +134,7 @@ std::string AppUtilUnix::getCurrentLanguageCode()
 
   result = X11LayoutsParser::convertLayoutToISO(m_evdev, result);
 
-#elif WINAPI_CARBON
+#elif defined(Q_OS_MAC)
   auto layoutLanguages =
       (CFArrayRef)TISGetInputSourceProperty(TISCopyCurrentKeyboardInputSource(), kTISPropertyInputSourceLanguages);
   char temporaryCString[128] = {0};

src/lib/gui/CMakeLists.txt

@@ -58,8 +58,6 @@ add_library(${target} STATIC
   core/ServerConnection.h
   core/ServerMessage.cpp
   core/ServerMessage.h
-  core/WaylandWarnings.cpp
-  core/WaylandWarnings.h
   dialogs/AboutDialog.cpp
   dialogs/AboutDialog.h
   dialogs/AboutDialog.ui
@@ -119,6 +117,8 @@ add_library(${target} STATIC
   widgets/ScreenSetupView.h
   widgets/SearchWidget.h
   widgets/SearchWidget.cpp
+  widgets/StatusBar.cpp
+  widgets/StatusBar.h
   widgets/TrashScreenWidget.cpp
   widgets/TrashScreenWidget.h
 )

src/lib/gui/MainWindow.cpp

@@ -29,6 +29,7 @@
 #include "gui/ipc/DaemonIpcClient.h"
 #include "gui/widgets/LogDock.h"
 #include "net/FingerprintDatabase.h"
+#include "widgets/StatusBar.h"
 
 #include <QCloseEvent>
 #include <QDesktopServices>
@@ -54,9 +55,6 @@
 
 using namespace deskflow::gui;
 
-using CoreConnectionState = CoreProcess::ConnectionState;
-using CoreProcessState = CoreProcess::ProcessState;
-
 MainWindow::MainWindow()
     : ui{std::make_unique<Ui::MainWindow>()},
       m_coreProcess(m_serverConfig),
@@ -66,10 +64,7 @@ MainWindow::MainWindow()
       m_guiDupeChecker{new QLocalServer(this)},
       m_daemonIpcClient{new ipc::DaemonIpcClient(this)},
       m_logDock{new LogDock(this)},
-      m_lblSecurityStatus{new QLabel(this)},
+      m_statusBar{new StatusBar(this)},
-      m_lblStatus{new QLabel(this)},
-      m_btnFingerprint{new QPushButton(this)},
-      m_btnUpdate{new QPushButton(this)},
       m_menuFile{new QMenu(this)},
       m_menuEdit{new QMenu(this)},
       m_menuView{new QMenu(this)},
@@ -141,8 +136,6 @@ MainWindow::MainWindow()
   connectSlots();
   setupTrayIcon();
   updateScreenName();
-  applyConfig();
-  restoreWindow();
 
   qDebug().noquote() << "active settings path:" << Settings::settingsPath();
 
@@ -161,6 +154,10 @@ MainWindow::MainWindow()
       m_fingerprint = {QCryptographicHash::Sha256, TlsUtility::certFingerprint()};
     }
   }
+
+  applyConfig();
+  m_statusBar->setSecurityIcon(TlsUtility::isEnabled());
+  restoreWindow();
 }
 MainWindow::~MainWindow()
 {
@@ -218,6 +215,7 @@ void MainWindow::setupControls()
 
   ui->lineEditName->setValidator(new QRegularExpressionValidator(m_nameRegEx, this));
   ui->lineEditName->setVisible(false);
+  ui->lineEditName->installEventFilter(this);
 
   if (deskflow::platform::isMac()) {
     ui->rbModeServer->setAttribute(Qt::WA_MacShowFocusRect, false);
@@ -226,31 +224,7 @@ void MainWindow::setupControls()
   } else {
     ui->btnSaveServerConfig->setIconSize(QSize(22, 22));
   }
-
+  setStatusBar(m_statusBar);
-  static const auto btnHeight = ui->statusBar->height() - 2;
-  static const auto btnSize = QSize(btnHeight, btnHeight);
-  static const auto iconSize = QSize(fontMetrics().height() + 2, fontMetrics().height() + 2);
-
-  m_btnFingerprint->setFlat(true);
-  m_btnFingerprint->setIcon(QIcon::fromTheme(QStringLiteral("fingerprint")));
-  m_btnFingerprint->setFixedSize(btnSize);
-  m_btnFingerprint->setIconSize(iconSize);
-  ui->statusBar->insertPermanentWidget(0, m_btnFingerprint);
-
-  m_lblSecurityStatus->setVisible(false);
-  m_lblSecurityStatus->setFixedSize(iconSize);
-  m_lblSecurityStatus->setScaledContents(true);
-  ui->statusBar->insertPermanentWidget(1, m_lblSecurityStatus);
-
-  ui->statusBar->insertPermanentWidget(2, m_lblStatus, 1);
-
-  m_btnUpdate->setVisible(false);
-  m_btnUpdate->setFlat(true);
-  m_btnUpdate->setLayoutDirection(Qt::RightToLeft);
-  m_btnUpdate->setIcon(QIcon::fromTheme(QStringLiteral("software-updates-release")));
-  m_btnUpdate->setFixedHeight(btnHeight);
-  m_btnUpdate->setIconSize(iconSize);
-  ui->statusBar->insertPermanentWidget(3, m_btnUpdate);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -276,6 +250,7 @@ void MainWindow::connectSlots()
   connect(
       &m_coreProcess, &CoreProcess::daemonIpcClientConnectionFailed, this, &MainWindow::daemonIpcClientConnectionFailed
   );
+  connect(&m_coreProcess, &CoreProcess::securityLevelChanged, m_statusBar, &StatusBar::setSecurityLevel);
 
   connect(m_actionAbout, &QAction::triggered, this, &MainWindow::openAboutDialog);
   connect(m_actionClearSettings, &QAction::triggered, this, &MainWindow::clearSettings);
@@ -290,8 +265,6 @@ void MainWindow::connectSlots()
   connect(m_actionRestartCore, &QAction::triggered, this, &MainWindow::resetCore);
   connect(m_actionStopCore, &QAction::triggered, this, &MainWindow::stopCore);
 
-  connect(&m_versionChecker, &VersionChecker::updateFound, this, &MainWindow::versionCheckerUpdateFound);
-
   // Mac os tray will only show a menu
   if (!deskflow::platform::isMac())
     connect(m_trayIcon, &QSystemTrayIcon::activated, this, &MainWindow::trayIconActivated);
@@ -319,14 +292,15 @@ void MainWindow::connectSlots()
   connect(ui->btnConfigureServer, &QPushButton::clicked, this, [this] { showConfigureServer(""); });
   connect(ui->btnConfigureClient, &QPushButton::clicked, this, [this] { showConfigureClient(); });
   connect(ui->lblComputerName, &QLabel::linkActivated, this, &MainWindow::openSettings);
-  connect(m_btnFingerprint, &QPushButton::clicked, this, &MainWindow::showMyFingerprint);
 
   connect(ui->rbModeServer, &QRadioButton::toggled, this, &MainWindow::coreModeToggled);
   connect(ui->rbModeClient, &QRadioButton::toggled, this, &MainWindow::coreModeToggled);
 
   connect(m_logDock->toggleViewAction(), &QAction::toggled, this, &MainWindow::toggleLogVisible);
 
-  connect(m_btnUpdate, &QPushButton::clicked, this, &MainWindow::openGetNewVersionUrl);
+  connect(m_statusBar, &StatusBar::requestShowMyFingerprints, this, &MainWindow::showMyFingerprint);
+  connect(m_statusBar, &StatusBar::requestUpdateVersion, this, &MainWindow::openGetNewVersionUrl);
+  connect(&m_versionChecker, &VersionChecker::updateFound, m_statusBar, &StatusBar::updateFound);
 
   connect(m_guiDupeChecker, &QLocalServer::newConnection, this, &MainWindow::showAndActivate);
 
@@ -384,7 +358,7 @@ void MainWindow::settingsChanged(const QString &key)
       qWarning() << tr("invalid certificate, generating a new one");
       TlsUtility::generateCertificate();
     }
-    updateSecurityIcon(m_lblSecurityStatus->isVisible());
+    updateSecurityIcon(m_statusBar->securityIconVisible());
     return;
   }
 }
@@ -401,12 +375,6 @@ void MainWindow::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
   isVisible() ? hide() : showAndActivate();
 }
 
-void MainWindow::versionCheckerUpdateFound(const QString &version)
-{
-  m_btnUpdate->setVisible(true);
-  m_btnUpdate->setToolTip(tr("A new version v%1 is available").arg(version));
-}
-
 void MainWindow::coreProcessError(CoreProcess::Error error)
 {
   if (error == CoreProcess::Error::AddressMissing) {
@@ -415,12 +383,17 @@ void MainWindow::coreProcessError(CoreProcess::Error error)
     );
   } else if (error == CoreProcess::Error::StartFailed) {
     show();
-    QMessageBox::warning(
+    auto message = tr("The Core executable could not be started.\n"
-        this, tr("Core cannot be started"),
+                      "Please check if you have sufficient permissions to run %1.")
-        tr("The Core executable could not be successfully started, "
+                       .arg(kCoreBinName);
-           "although it does exist. "
+
-           "Please check if you have sufficient permissions to run this program.")
+    if (Settings::value(Settings::Core::CoreMode) == Settings::CoreMode::Server) {
-    );
+      const auto mode =
+          Settings::value(Settings::Server::ExternalConfigFile).toBool() ? tr("read") : tr("read and write");
+      message.append(tr("\nAdditionally, check you are able to %1 the server config file: %2")
+                         .arg(mode, Settings::serverConfigFile()));
+    }
+    QMessageBox::warning(this, kAppName, message);
   }
 }
 
@@ -428,13 +401,13 @@ void MainWindow::startCore()
 {
   // Save current IP state when server starts
   if (m_coreProcess.mode() == CoreMode::Server && Settings::value(Settings::Core::Interface).toString().isEmpty()) {
-    m_serverStartIPs = m_networkMonitor->getAvailableIPv4Addresses();
+    m_serverStartIPs = NetworkMonitor::validAddresses();
     m_serverStartSuggestedIP = m_serverStartIPs.isEmpty() ? "" : m_serverStartIPs.first();
   }
 
-  m_coreProcess.start();
   m_actionStartCore->setVisible(false);
   m_actionRestartCore->setVisible(true);
+  m_coreProcess.start();
 }
 
 void MainWindow::stopCore()
@@ -499,7 +472,7 @@ void MainWindow::openGetNewVersionUrl() const
 
 void MainWindow::openSettings()
 {
-  auto dialog = SettingsDialog(this, m_serverConfig, m_coreProcess);
+  auto dialog = SettingsDialog(this, m_serverConfig);
 
   if (dialog.exec() == QDialog::Accepted) {
     Settings::save();
@@ -559,7 +532,7 @@ void MainWindow::updateModeControls()
   ui->lblIpAddresses->setVisible(isServer);
   ui->clientOptions->setVisible(isClient);
   ui->lblNoMode->setVisible(!isServer && !isClient);
-  toggleCanRunCore((isServer || isClient) && (isClient && !ui->lineHostname->text().isEmpty()) || isServer);
+  toggleCanRunCore(canRunCore());
 
   if (isServer) {
     updateNetworkInfo();
@@ -610,23 +583,15 @@ void MainWindow::updateModeControlLabels()
 
 void MainWindow::updateSecurityIcon(bool visible)
 {
-  m_lblSecurityStatus->setVisible(visible);
+  m_statusBar->setSecurityIconVisible(visible);
   if (!visible)
     return;
-
+  m_statusBar->setSecurityIcon(TlsUtility::isEnabled());
-  bool secureSocket = TlsUtility::isEnabled();
-
-  const auto txt =
-      secureSocket ? tr("%1 Encryption Enabled").arg(m_coreProcess.secureSocketVersion()) : tr("Encryption Disabled");
-  m_lblSecurityStatus->setToolTip(txt);
-
-  const auto icon = QIcon::fromTheme(secureSocket ? QIcon::ThemeIcon::SecurityHigh : QIcon::ThemeIcon::SecurityLow);
-  m_lblSecurityStatus->setPixmap(icon.pixmap(QSize(32, 32)));
 }
 
 void MainWindow::updateNetworkInfo()
 {
-  updateIpLabel(m_networkMonitor->getAvailableIPv4Addresses());
+  updateIpLabel(NetworkMonitor::validAddresses());
 }
 
 void MainWindow::serverConnectionConfigureClient(const QString &clientName)
@@ -645,7 +610,13 @@ void MainWindow::serverConnectionConfigureClient(const QString &clientName)
 
 void MainWindow::open()
 {
-  Settings::value(Settings::Gui::Autohide).toBool() ? hide() : showAndActivate();
+  if (!Settings::value(Settings::Gui::Autohide).toBool())
+    showAndActivate();
+  else if (deskflow::platform::isMac())
+    // macOS to call hide after this function ends
+    QTimer::singleShot(1, this, &MainWindow::hide);
+  else
+    hide();
 
   // if a critical error was shown just before the main window (i.e. on app
   // load), it will be hidden behind the main window. therefore we need to raise
@@ -674,11 +645,6 @@ void MainWindow::open()
   }
 }
 
-void MainWindow::setStatus(const QString &status)
-{
-  m_lblStatus->setText(status);
-}
-
 void MainWindow::createMenuBar()
 {
   m_menuFile->addAction(m_actionStartCore);
@@ -902,71 +868,22 @@ void MainWindow::showFirstConnectedMessage()
 
 void MainWindow::updateStatus()
 {
+  using enum ProcessState;
   const auto connection = m_coreProcess.connectionState();
   const auto process = m_coreProcess.processState();
   const bool isServer = (m_coreProcess.mode() == CoreMode::Server);
-
+  if (process == Stopped || process == Started) {
-  updateSecurityIcon(false);
-  switch (process) {
-    using enum CoreProcessState;
-
-  case Starting:
-    setStatus(tr("%1 is starting...").arg(kAppName));
-    break;
-
-  case RetryPending:
-    setStatus(tr("%1 will retry in a moment...").arg(kAppName));
-    break;
-
-  case Stopping:
-    setStatus(tr("%1 is stopping...").arg(kAppName));
-    break;
-
-  case Stopped:
     updateNetworkInfo();
-    setStatus(tr("%1 is not running").arg(kAppName));
+    ui->btnEditName->setVisible(process == Stopped);
-    break;
+  }
-
+  m_statusBar->setStatus(connection, process, isServer);
-  case Started: {
-    updateNetworkInfo();
-    switch (connection) {
-      using enum CoreConnectionState;
-
-    case Listening: {
-      if (isServer) {
-        updateSecurityIcon(true);
-        setStatus(tr("%1 is waiting for clients").arg(kAppName));
 }
 
-      break;
+void MainWindow::coreProcessStateChanged(ProcessState state)
-    }
-
-    case Connecting:
-      setStatus(tr("%1 is connecting...").arg(kAppName));
-      break;
-
-    case Connected: {
-      updateSecurityIcon(true);
-      if (!isServer) {
-        setStatus(tr("%1 is connected as client of %2")
-                      .arg(kAppName, Settings::value(Settings::Client::RemoteHost).toString()));
-      }
-      break;
-    }
-
-    case Disconnected:
-      setStatus(tr("%1 is disconnected").arg(kAppName));
-      break;
-    }
-  } break;
-  }
-}
-
-void MainWindow::coreProcessStateChanged(CoreProcessState state)
 {
+  using enum ProcessState;
   updateStatus();
-
+  if (state == Started) {
-  if (state == CoreProcessState::Started) {
     qDebug() << "recording that core has started";
     Settings::setValue(Settings::Gui::AutoStartCore, true);
     if (m_coreProcess.mode() == CoreMode::Server &&
@@ -977,8 +894,7 @@ void MainWindow::coreProcessStateChanged(CoreProcessState state)
     }
   }
 
-  if (state == CoreProcessState::Started || state == CoreProcessState::Starting ||
+  if (state == Started || state == Starting || state == RetryPending) {
-      state == CoreProcessState::RetryPending) {
     disconnect(ui->btnToggleCore, &QPushButton::clicked, m_actionStartCore, &QAction::trigger);
     connect(ui->btnToggleCore, &QPushButton::clicked, m_actionStopCore, &QAction::trigger, Qt::UniqueConnection);
 
@@ -987,10 +903,7 @@ void MainWindow::coreProcessStateChanged(CoreProcessState state)
     m_actionRestartCore->setVisible(true);
     m_actionStopCore->setEnabled(true);
 
-    if (state == CoreProcessState::Starting) {
+    if (state == Starting) {
-      if (deskflow::platform::isWayland()) {
-        m_waylandWarnings.showOnce(this);
-      }
       saveSettings();
     }
 
@@ -1006,7 +919,7 @@ void MainWindow::coreProcessStateChanged(CoreProcessState state)
   updateModeControlLabels();
 }
 
-void MainWindow::coreConnectionStateChanged(CoreConnectionState state)
+void MainWindow::coreConnectionStateChanged(ConnectionState state)
 {
   qDebug() << "core connection state changed: " << static_cast<int>(state);
 
@@ -1015,7 +928,7 @@ void MainWindow::coreConnectionStateChanged(CoreConnectionState state)
   // always assume connection is not secure when connection changes
   // to anything except connected. the only way the padlock shows is
   // when the correct TLS version string is detected.
-  if (state != CoreConnectionState::Connected) {
+  if (state != ConnectionState::Connected) {
     secureSocket(false);
   } else if (isVisible()) {
     showFirstConnectedMessage();
@@ -1024,7 +937,7 @@ void MainWindow::coreConnectionStateChanged(CoreConnectionState state)
 
 void MainWindow::updateLocalFingerprint()
 {
-  m_btnFingerprint->setVisible(TlsUtility::isEnabled() && !m_fingerprint.data.isEmpty());
+  m_statusBar->setBtnFingerprintVisible(TlsUtility::isEnabled() && !m_fingerprint.data.isEmpty());
 }
 
 void MainWindow::hide()
@@ -1055,6 +968,20 @@ void MainWindow::changeEvent(QEvent *e)
   }
 }
 
+bool MainWindow::eventFilter(QObject *obj, QEvent *event)
+{
+  if (obj != ui->lineEditName || event->type() != QEvent::KeyPress)
+    return false;
+  if (const auto keyEvent = static_cast<QKeyEvent *>(event); keyEvent->key() != Qt::Key_Escape)
+    return false;
+  ui->lineEditName->hide();
+  ui->lblComputerName->show();
+  ui->btnEditName->show();
+  ui->lineEditName->setText(Settings::value(Settings::Core::ComputerName).toString());
+  toggleCanRunCore(canRunCore());
+  return true;
+}
+
 void MainWindow::updateText()
 {
   m_menuFile->setTitle(tr("&File"));
@@ -1088,10 +1015,6 @@ void MainWindow::updateText()
     m_actionQuit->setShortcut(QKeySequence(tr("Ctrl+Q")));
     m_actionTrayQuit->setShortcut(QKeySequence(tr("Ctrl+Q")));
   }
-
-  // General controls
-  m_btnFingerprint->setToolTip(tr("View local fingerprint"));
-  m_btnUpdate->setText(tr("Update available"));
 }
 
 void MainWindow::showConfigureServer(const QString &message)
@@ -1114,7 +1037,7 @@ void MainWindow::showConfigureClient()
 void MainWindow::secureSocket(bool secureSocket)
 {
   m_secureSocket = secureSocket;
-  updateSecurityIcon(m_lblSecurityStatus->isVisible());
+  updateSecurityIcon(m_statusBar->securityIconVisible());
 }
 
 void MainWindow::updateScreenName()
@@ -1145,6 +1068,7 @@ void MainWindow::showHostNameEditor()
   ui->lineEditName->show();
   ui->lblComputerName->hide();
   ui->btnEditName->hide();
+  toggleCanRunCore(false);
   ui->lineEditName->setFocus();
 }
 
@@ -1153,6 +1077,7 @@ void MainWindow::setHostName()
   ui->lineEditName->hide();
   ui->lblComputerName->show();
   ui->btnEditName->show();
+  toggleCanRunCore(canRunCore());
 
   QString text = ui->lineEditName->text();
   const auto screenName = Settings::value(Settings::Core::ComputerName).toString();
@@ -1216,21 +1141,7 @@ void MainWindow::serverClientsChanged(const QStringList &clients)
 {
   if (m_coreProcess.mode() != CoreMode::Server || !m_coreProcess.isStarted())
     return;
-
+  m_statusBar->setServerClients(clients);
-  if (clients.isEmpty()) {
-    setStatus(tr("%1 is waiting for clients").arg(kAppName));
-    ui->statusBar->setToolTip("");
-    return;
-  }
-
-  //: Shown when in server mode and at least 1 client is connected
-  //: %1 is replaced by the app name
-  //: %2 will be a list of at least one client
-  //: %n will be replaced by the number of clients (n is >=1), it is not requried to be in the translation
-  setStatus(tr("%1 is connected, with %n client(s): %2", "", clients.size()).arg(kAppName, clients.join(", ")));
-
-  const auto toolTipString = clients.count() == 1 ? "" : tr("Clients:\n %1").arg(clients.join("\n"));
-  ui->statusBar->setToolTip(toolTipString);
 }
 
 void MainWindow::daemonIpcClientConnectionFailed()
@@ -1262,12 +1173,22 @@ void MainWindow::remoteHostChanged(const QString &newRemoteHost)
 
 void MainWindow::showClientError(deskflow::client::ErrorType error, const QString &address)
 {
-  if (!Settings::value(Settings::Gui::ShowGenericClientFailureDialog).toBool() || !isVisible() || m_clientErrorVisible)
+  if (!isVisible() || m_clientErrorVisible || error != deskflow::client::ErrorType::AlreadyConnected)
     return;
 
   m_clientErrorVisible = true;
+
   showAndActivate();
-  deskflow::gui::messages::showClientConnectError(this, error, address);
+
+  QMessageBox::warning(
+      this, tr("%1 Connection Error").arg(kAppName),
+      tr("<p>Failed to connect to the server '%1'.</p>"
+         "<p>A Client with your name is already connected to the server.</p>"
+         "Please ensure that you're using a unique name and that only a "
+         "single instance of the client process is running.</p>")
+          .arg(address)
+  );
+
   m_clientErrorVisible = false;
 }
 
@@ -1324,3 +1245,11 @@ void MainWindow::updateIpLabel(const QStringList &addresses)
   ui->lblIpAddresses->setText(labelText);
   ui->lblIpAddresses->setToolTip(toolTipText);
 }
+
+bool MainWindow::canRunCore() const
+{
+  const auto mode = m_coreProcess.mode();
+  const bool isServer = mode == Settings::CoreMode::Server;
+  const bool isClient = mode == Settings::CoreMode::Client;
+  return ((isServer || isClient) && (isClient && !ui->lineHostname->text().isEmpty()) || isServer);
+}

src/lib/gui/MainWindow.h

@@ -24,7 +24,6 @@
 #include "gui/core/CoreProcess.h"
 #include "gui/core/NetworkMonitor.h"
 #include "gui/core/ServerConnection.h"
-#include "gui/core/WaylandWarnings.h"
 #include "net/Fingerprint.h"
 
 #ifdef Q_OS_MACOS
@@ -48,6 +47,7 @@ class QLocalServer;
 
 class DeskflowApplication;
 class LogDock;
+class StatusBar;
 
 namespace Ui {
 class MainWindow;
@@ -59,9 +59,11 @@ class DaemonIpcClient;
 
 class MainWindow : public QMainWindow
 {
+  using ConnectionState = deskflow::core::ConnectionState;
   using CoreMode = Settings::CoreMode;
   using CoreProcess = deskflow::gui::CoreProcess;
   using NetworkMonitor = deskflow::gui::NetworkMonitor;
+  using ProcessState = deskflow::core::ProcessState;
 
   Q_OBJECT
 
@@ -93,6 +95,7 @@ public:
 
 protected:
   void changeEvent(QEvent *e) override;
+  bool eventFilter(QObject *obj, QEvent *event) override;
 
 private:
   /**
@@ -104,9 +107,9 @@ private:
   void settingsChanged(const QString &key = QString());
   void serverConfigSaving();
   void coreProcessError(CoreProcess::Error error);
-  void coreConnectionStateChanged(CoreProcess::ConnectionState state);
+  void coreConnectionStateChanged(ConnectionState state);
-  void coreProcessStateChanged(CoreProcess::ProcessState state);
+  void coreProcessStateChanged(ProcessState state);
-  void versionCheckerUpdateFound(const QString &version);
+
   void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
   void serverConnectionConfigureClient(const QString &clientName);
 
@@ -133,7 +136,6 @@ private:
   void setupTrayIcon();
   void applyConfig();
   void setTrayIcon();
-  void setStatus(const QString &status);
   void updateFromLogLine(const QString &line);
   void checkConnected(const QString &line);
   void checkFingerprint(const QString &line);
@@ -159,6 +161,7 @@ private:
   void handleNewClientPromptRequest(const QString &clientName, bool usePeerAuth);
   void updateIpLabel(const QStringList &addresses);
 
+  bool canRunCore() const;
   /**
    * @brief showClientError
    * @param error Error Type
@@ -189,7 +192,6 @@ private:
   bool m_secureSocket = false;
   bool m_saveOnExit = true;
   bool m_clientErrorVisible = false;
-  deskflow::gui::core::WaylandWarnings m_waylandWarnings;
   ServerConfig m_serverConfig;
   deskflow::gui::CoreProcess m_coreProcess;
   deskflow::gui::ServerConnection m_serverConnection;
@@ -202,10 +204,7 @@ private:
   deskflow::gui::ipc::DaemonIpcClient *m_daemonIpcClient = nullptr;
 
   LogDock *m_logDock;
-  QLabel *m_lblSecurityStatus = nullptr;
+  StatusBar *m_statusBar = nullptr;
-  QLabel *m_lblStatus = nullptr;
-  QPushButton *m_btnFingerprint = nullptr;
-  QPushButton *m_btnUpdate = nullptr;
 
   // Window Menu
   QMenu *m_menuFile = nullptr;

src/lib/gui/MainWindow.ui

@@ -497,7 +497,6 @@
     </item>
    </layout>
   </widget>
-  <widget class="QStatusBar" name="statusBar"/>
  </widget>
  <resources/>
  <connections/>

src/lib/gui/Messages.cpp

@@ -8,7 +8,6 @@
 
 #include "Logger.h"
 
-#include "common/Enums.h"
 #include "common/Settings.h"
 #include "common/UrlConstants.h"
 #include "common/VersionInfo.h"
@@ -183,61 +182,6 @@ void showFirstConnectedMessage(QWidget *parent, bool closeToTray, bool enableSer
   QMessageBox::information(parent, title, message);
 }
 
-void showClientConnectError(QWidget *parent, deskflow::client::ErrorType error, const QString &address)
-{
-  using enum deskflow::client::ErrorType;
-  if (error == NoError)
-    return;
-
-  auto message = QObject::tr("<p>Failed to connect to the server '%1'.</p>").arg(address);
-
-  if (error == AlreadyConnected) {
-    message.append(
-        QObject::tr( //
-            "<p>A Client with your name is already connected to the server.</p>"
-            "Please ensure that you're using a unique name and that only a "
-            "single instance of the client process is running.</p>"
-        )
-    );
-  } else if (error == HostnameError) {
-    message.append(
-        QObject::tr( //
-            "<p>Please try to connect to the server using the server IP address "
-            "instead of the hostname. </p>"
-            "<p>If that doesn't work, please check your TLS and "
-            "firewall settings.</p>"
-        )
-    );
-  } else if (error == GenericError) {
-    message.append(QObject::tr("<p>Please check your TLS and firewall settings.</p>"));
-  } else {
-    qFatal("unknown client error");
-  }
-
-  auto title = QObject::tr("%1 Connection Error").arg(kAppName);
-
-  if (error != HostnameError) {
-    QMessageBox::warning(parent, title, message);
-    return;
-  }
-
-  auto dialog = QMessageBox(parent);
-  dialog.setWindowTitle(title);
-  dialog.setText(message);
-  dialog.setWindowModality(Qt::ApplicationModal);
-  dialog.setIcon(QMessageBox::Information);
-
-  auto cbNoShowAgain = new QCheckBox(QObject::tr("Do not show this message again"));
-
-  QObject::connect(cbNoShowAgain, &QCheckBox::toggled, [](bool enabled) {
-    Settings::setValue(Settings::Gui::ShowGenericClientFailureDialog, !enabled);
-  });
-
-  dialog.setCheckBox(cbNoShowAgain);
-  dialog.setDefaultButton(QMessageBox::Ok);
-  dialog.exec();
-}
-
 bool showNewClientPrompt(QWidget *parent, const QString &clientName, bool serverRequiresPeerAuth)
 {
   if (serverRequiresPeerAuth) {
@@ -280,24 +224,6 @@ void showReadOnlySettings(QWidget *parent, const QString &systemSettingsPath)
   QMessageBox::information(parent, title, message);
 }
 
-void showWaylandLibraryError(QWidget *parent)
-{
-  QMessageBox::critical(
-      parent, kAppName,
-      QObject::tr(
-          "<p>Sorry, while this version of %1 does support Wayland, "
-          "this build was not linked with one or more of the required "
-          "libraries.</p>"
-          "<p>Please either switch to X from your login screen or use a build "
-          "that uses the correct libraries.</p>"
-          "<p>If you think this is incorrect, please "
-          R"(<a href="%2">report a bug</a>.</p>)"
-          "<p>Please check the logs for more information.</p>"
-      )
-          .arg(kAppName, kUrlHelp)
-  );
-}
-
 bool showUpdateCheckOption(QWidget *parent)
 {
   QMessageBox message(parent);

src/lib/gui/Messages.h

@@ -25,16 +25,12 @@ void showFirstConnectedMessage(QWidget *parent, bool closeToTray, bool enableSer
 
 void showCloseReminder(QWidget *parent);
 
-void showClientConnectError(QWidget *parent, deskflow::client::ErrorType error, const QString &address);
-
 bool showNewClientPrompt(QWidget *parent, const QString &clientName, bool serverRequiresPeerAuth = false);
 
 bool showClearSettings(QWidget *parent);
 
 void showReadOnlySettings(QWidget *parent, const QString &systemSettingsPath);
 
-void showWaylandLibraryError(QWidget *parent);
-
 bool showUpdateCheckOption(QWidget *parent);
 
 bool showDaemonOffline(QWidget *parent);

src/lib/gui/core/CoreProcess.cpp

@@ -14,6 +14,11 @@
 #include "OSXHelpers.h"
 #endif
 
+#ifdef Q_OS_LINUX
+#include <signal.h>
+#include <sys/prctl.h>
+#endif
+
 #include <QCoreApplication>
 #include <QDir>
 #include <QFile>
@@ -203,6 +208,14 @@ void CoreProcess::startForegroundProcess(const QStringList &args)
   const auto quoted = makeQuotedArgs(m_appPath, args);
   qInfo("running command: %s", qPrintable(quoted));
 
+#ifdef Q_OS_LINUX
+  m_process->setChildProcessModifier([] {
+    // the core process becomes orphaned when the gui process exits abruptly (e.g. with kill -9),
+    // so ensure the os also kills the core when that happens to the gui.
+    prctl(PR_SET_PDEATHSIG, SIGTERM);
+  });
+#endif
+
   m_process->start(m_appPath, args);
 
   if (m_process->waitForStarted()) {
@@ -330,11 +343,17 @@ void CoreProcess::start(std::optional<ProcessMode> processModeOption)
   QStringList args = {coreMode};
 
   if (m_mode == Settings::CoreMode::Server) {
-    const auto configFilename = persistServerConfig();
+    const auto [hasNeededPermissions, configFilename] = persistServerConfig();
     if (configFilename.isEmpty()) {
       qFatal("config file name empty for server args");
       return;
     }
+    if (!hasNeededPermissions) {
+      setProcessState(ProcessState::Stopped);
+      setConnectionState(ConnectionState::Disconnected);
+      Q_EMIT error(Error::StartFailed);
+      return;
+    }
     qInfo("core config file: %s", qPrintable(configFilename));
   }
 
@@ -417,21 +436,22 @@ void CoreProcess::cleanup()
   }
 }
 
-QString CoreProcess::persistServerConfig() const
+QPair<bool, QString> CoreProcess::persistServerConfig() const
 {
   if (Settings::value(Settings::Server::ExternalConfig).toBool()) {
-    return Settings::value(Settings::Server::ExternalConfigFile).toString();
+    return {Settings::isServerConfigFileReadable(), Settings::value(Settings::Server::ExternalConfigFile).toString()};
   }
 
   const auto configFilePath = Settings::defaultValue(Settings::Server::ExternalConfigFile).toString();
   QFile configFile(configFilePath);
   if (!configFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
-    qFatal("failed to open core config file for write: %s", qPrintable(configFile.fileName()));
+    qWarning() << "failed to open core config file for write:" << configFilePath;
+    return {false, configFile.fileName()};
   }
 
   m_serverConfig.save(configFile);
   configFile.close();
-  return configFile.fileName();
+  return {Settings::isServerConfigFileReadable(), configFile.fileName()};
 }
 
 void CoreProcess::setConnectionState(ConnectionState state)
@@ -498,7 +518,11 @@ bool CoreProcess::checkSecureSocket(const QString &line)
   }
 
   Q_EMIT secureSocket(true);
-  m_secureSocketVersion = line.mid(index + tlsCheckString.size());
+  if (const auto ssv = line.mid(index + tlsCheckString.size()); ssv != m_secureSocketVersion) {
+    m_secureSocketVersion = ssv;
+    Q_EMIT securityLevelChanged(ssv);
+  }
+
   return true;
 }
 

src/lib/gui/core/CoreProcess.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "common/Enums.h"
 #include "common/Settings.h"
 #include "gui/FileTail.h"
 #include "gui/config/IServerConfig.h"
@@ -24,7 +25,9 @@ class DaemonIpcClient;
 
 class CoreProcess : public QObject
 {
+  using ConnectionState = deskflow::core::ConnectionState;
   using ProcessMode = Settings::ProcessMode;
+  using ProcessState = deskflow::core::ProcessState;
   using IServerConfig = deskflow::gui::IServerConfig;
 
   Q_OBJECT
@@ -35,23 +38,6 @@ public:
     AddressMissing,
     StartFailed
   };
-  enum class ProcessState
-  {
-    Starting,
-    Started,
-    Stopping,
-    Stopped,
-    RetryPending
-  };
-  Q_ENUM(ProcessState)
-
-  enum class ConnectionState
-  {
-    Disconnected,
-    Connecting,
-    Connected,
-    Listening
-  };
 
   explicit CoreProcess(const IServerConfig &serverConfig);
 
@@ -98,10 +84,11 @@ public:
 Q_SIGNALS:
   void error(deskflow::gui::CoreProcess::Error error);
   void logLine(const QString &line);
-  void connectionStateChanged(deskflow::gui::CoreProcess::ConnectionState state);
+  void connectionStateChanged(deskflow::core::ConnectionState state);
-  void processStateChanged(deskflow::gui::CoreProcess::ProcessState state);
+  void processStateChanged(deskflow::core::ProcessState state);
   void secureSocket(bool enabled);
   void daemonIpcClientConnectionFailed();
+  void securityLevelChanged(QString securityLevel);
 
 private Q_SLOTS:
   void onProcessFinished(int exitCode, QProcess::ExitStatus);
@@ -114,7 +101,7 @@ private:
   void startProcessFromDaemon(const QStringList &args);
   void stopForegroundProcess() const;
   void stopProcessFromDaemon();
-  QString persistServerConfig() const;
+  QPair<bool, QString> persistServerConfig() const;
   void setConnectionState(ConnectionState state);
   void setProcessState(ProcessState state);
   void checkLogLine(const QString &line);

src/lib/gui/core/NetworkMonitor.cpp

@@ -19,7 +19,7 @@ bool NetworkMonitor::isVirtualInterface(const QString &interfaceName)
 {
   // Common virtual network interface patterns
   static const auto virtualRegEx = QRegularExpression(
-      QStringLiteral("^vboxnet|vmnet|docker|virbr|veth|br\\-|tun|utun|awdl|p2p|llw|anpi|tap"),
+      QStringLiteral("^vboxnet|vmnet|docker|virbr|veth|br\\-|tun|utun|awdl|p2p|llw|anpi|tap|vEth"),
       QRegularExpression::CaseInsensitiveOption
   );
   return virtualRegEx.match(interfaceName).hasMatch();
@@ -52,10 +52,12 @@ void NetworkMonitor::stopMonitoring()
   m_isMonitoring = false;
 }
 
-QStringList NetworkMonitor::getAvailableIPv4Addresses() const
+QStringList NetworkMonitor::validAddresses()
 {
-  QList<QHostAddress> physicalIPs;
+  QList<QHostAddress> physicalIP4;
-  QList<QHostAddress> virtualIPs;
+  QList<QHostAddress> physicalIP6;
+  QList<QHostAddress> virtualIP4;
+  QList<QHostAddress> virtualIP6;
   QSet<QHostAddress> uniqueAddresses;
 
   const auto allInterfaces = QNetworkInterface::allInterfaces();
@@ -66,39 +68,57 @@ QStringList NetworkMonitor::getAvailableIPv4Addresses() const
     }
 
     const bool isP2P = (interface.flags() & QNetworkInterface::IsPointToPoint);
-    const bool isVirtual = isVirtualInterface(interface.name()) || isP2P;
+    const bool isVirtualType = interface.type() == QNetworkInterface::Virtual;
+    const bool isVirtual = isVirtualInterface(interface.humanReadableName()) || isP2P || isVirtualType;
     const auto addressEntries = interface.addressEntries();
 
     for (const auto &entry : addressEntries) {
       const QHostAddress address = entry.ip();
 
-      if (address.protocol() != QAbstractSocket::IPv4Protocol || address.isLinkLocal() || address.isLoopback() ||
+      if (address.isLinkLocal() || address.isLoopback() || uniqueAddresses.contains(address)) {
-          uniqueAddresses.contains(address)) {
         continue;
       }
 
       uniqueAddresses.insert(address);
 
-      if (isVirtual) {
+      if (address.protocol() == QHostAddress::IPv6Protocol) {
-        virtualIPs.append(address);
+        if (isVirtual)
+          virtualIP6.append(address);
+        else
+          physicalIP6.append(address);
       } else {
-        physicalIPs.append(address);
+        if (isVirtual)
+          virtualIP4.append(address);
+        else
+          physicalIP4.append(address);
       }
     }
   }
 
-  std::ranges::sort(physicalIPs, [](const QHostAddress &a, const QHostAddress &b) {
+  std::ranges::sort(physicalIP4, [](const QHostAddress &a, const QHostAddress &b) {
     if (a.isPrivateUse() != b.isPrivateUse())
       return a.isPrivateUse();
     return a.toIPv4Address() < b.toIPv4Address();
   });
 
-  std::ranges::sort(virtualIPs, [](const QHostAddress &a, const QHostAddress &b) {
+  std::ranges::sort(virtualIP4, [](const QHostAddress &a, const QHostAddress &b) {
     return a.toIPv4Address() < b.toIPv4Address();
   });
 
-  auto result = physicalIPs;
+  std::ranges::sort(physicalIP6, [](const QHostAddress &a, const QHostAddress &b) {
-  result.append(virtualIPs);
+    if (a.isPrivateUse() != b.isPrivateUse())
+      return a.isPrivateUse();
+    return a.toString() < b.toString();
+  });
+
+  std::ranges::sort(virtualIP6, [](const QHostAddress &a, const QHostAddress &b) {
+    return a.toString() < b.toString();
+  });
+
+  auto result = physicalIP4;
+  result.append(virtualIP4);
+  result.append(physicalIP6);
+  result.append(virtualIP6);
 
   QStringList ipList;
   for (const auto &host : result) {
@@ -117,7 +137,7 @@ void NetworkMonitor::setIpAddresses(const QStringList &newAddresses)
 
 void NetworkMonitor::updateNetworkState()
 {
-  setIpAddresses(getAvailableIPv4Addresses());
+  setIpAddresses(validAddresses());
 }
 
 } // namespace deskflow::gui

src/lib/gui/core/NetworkMonitor.h

@@ -47,10 +47,10 @@ public:
   void stopMonitoring();
 
   /**
-   * @brief Get list of all available IPv4 addresses (excluding local and link-local addresses)
+   * @brief Get list of all available IP addresses (excluding local and link-local addresses)
-   * @return IPv4 address list
+   * @return IP address list
    */
-  QStringList getAvailableIPv4Addresses() const;
+  static QStringList validAddresses();
 
   /**
    * @brief Check if a network interface is virtual

src/lib/gui/core/WaylandWarnings.cpp

@@ -1,31 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
- * SPDX-FileCopyrightText: (C) 2024 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "WaylandWarnings.h"
-
-#include "Messages.h"
-#include "common/Settings.h"
-
-namespace deskflow::gui::core {
-
-void WaylandWarnings::showOnce(QWidget *parent)
-{
-  const auto mode = Settings::value(Settings::Core::CoreMode).value<Settings::CoreMode>();
-  const bool portalIcProblem = !m_hasPortalInputCapture && mode == Settings::CoreMode::Server;
-
-  if (!m_hasEi || !m_hasPortal || portalIcProblem) {
-    if (!m_errorShown) {
-      m_errorShown = true;
-      messages::showWaylandLibraryError(parent);
-    } else {
-      qWarning("missing required wayland lib(s) or feature");
-    }
-    return;
-  }
-}
-
-} // namespace deskflow::gui::core

src/lib/gui/core/WaylandWarnings.h

@@ -1,43 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
- * SPDX-FileCopyrightText: (C) 2024 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include <QWidget>
-
-namespace deskflow::gui::core {
-
-class WaylandWarnings
-{
-public:
-  explicit WaylandWarnings() = default;
-
-  void showOnce(QWidget *parent);
-
-private:
-  bool m_errorShown{false};
-
-#if WINAPI_LIBEI
-  const bool m_hasEi = true;
-#else
-  const bool m_hasEi = false;
-#endif
-
-#if WINAPI_LIBPORTAL
-  const bool m_hasPortal = true;
-#else
-  const bool m_hasPortal = false;
-#endif
-
-#if HAVE_LIBPORTAL_INPUTCAPTURE
-  const bool m_hasPortalInputCapture = true;
-#else
-  const bool m_hasPortalInputCapture = false;
-#endif
-};
-
-} // namespace deskflow::gui::core

src/lib/gui/dialogs/SettingsDialog.cpp

@@ -23,15 +23,18 @@
 
 using namespace deskflow::gui;
 
-SettingsDialog::SettingsDialog(QWidget *parent, const IServerConfig &serverConfig, const CoreProcess &coreProcess)
+SettingsDialog::SettingsDialog(QWidget *parent, const IServerConfig &serverConfig)
     : QDialog(parent),
       ui{std::make_unique<Ui::SettingsDialog>()},
-      m_serverConfig(serverConfig),
+      m_serverConfig(serverConfig)
-      m_coreProcess(coreProcess)
 {
 
   ui->setupUi(this);
 
+  // these are enabled by the control next to them
+  ui->lineCommandEnter->setEnabled(false);
+  ui->lineCommandExit->setEnabled(false);
+
   // set up the language combo
   I18N::reDetectLanguages();
   ui->comboLanguage->addItems(I18N::detectedLanguages());
@@ -51,14 +54,19 @@ SettingsDialog::SettingsDialog(QWidget *parent, const IServerConfig &serverConfi
   ui->tabWidget->setCurrentIndex(0);
 
   // Populate the list of IP addresses
-  NetworkMonitor networkMonitor(this);
+  const auto validAddresses = NetworkMonitor::validAddresses();
-  for (const auto &address : networkMonitor.getAvailableIPv4Addresses()) {
+  for (const auto &address : validAddresses) {
     QString ipString = address;
     if (ui->comboInterface->findText(ipString) == -1) {
       ui->comboInterface->addItem(ipString, ipString);
     }
   }
 
+  if (const auto interface = Settings::value(Settings::Core::Interface).toString();
+      !interface.isEmpty() && (ui->comboInterface->findData(interface) == -1)) {
+    ui->comboInterface->addItem(interface, interface);
+  }
+
   loadFromConfig();
 
   adjustSize();
@@ -66,6 +74,7 @@ SettingsDialog::SettingsDialog(QWidget *parent, const IServerConfig &serverConfi
   setFixedHeight(height());
   setWindowFlags((windowFlags() | Qt::CustomizeWindowHint) & ~Qt::WindowMinMaxButtonsHint);
 
+  setButtonBoxEnabledButtons();
   initConnections();
 }
 
@@ -84,6 +93,14 @@ void SettingsDialog::initConnections() const
 
   connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &SettingsDialog::accept);
   connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+  connect(ui->buttonBox->button(QDialogButtonBox::Reset), &QPushButton::clicked, this, &SettingsDialog::loadFromConfig);
+  connect(
+      ui->buttonBox->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, this,
+      &SettingsDialog::resetToDefault
+  );
+
+  connect(ui->cbRunEnterCommand, &QCheckBox::toggled, ui->lineCommandEnter, &QLineEdit::setEnabled);
+  connect(ui->cbRunExitCommand, &QCheckBox::toggled, ui->lineCommandExit, &QLineEdit::setEnabled);
 
   connect(ui->groupSecurity, &QGroupBox::toggled, this, &SettingsDialog::updateTlsControlsEnabled);
   connect(ui->groupService, &QGroupBox::toggled, this, &SettingsDialog::updateControls);
@@ -91,12 +108,38 @@ void SettingsDialog::initConnections() const
   connect(ui->comboTlsKeyLength, &QComboBox::currentIndexChanged, this, &SettingsDialog::updateRequestedKeySize);
   connect(ui->btnTlsCertPath, &QPushButton::clicked, this, &SettingsDialog::browseCertificatePath);
   connect(ui->btnBrowseLog, &QPushButton::clicked, this, &SettingsDialog::browseLogPath);
-  connect(ui->cbLogToFile, &QCheckBox::toggled, this, &SettingsDialog::setLogToFile);
+  connect(ui->groupLogToFile, &QGroupBox::toggled, this, &SettingsDialog::setLogToFile);
   connect(ui->comboLogLevel, &QComboBox::currentIndexChanged, this, &SettingsDialog::logLevelChanged);
   connect(ui->comboLanguage, &QComboBox::currentTextChanged, this, [](const QString &lang) {
     const auto shortName = I18N::nativeTo639Name(lang);
     I18N::setLanguage(shortName);
   });
+
+  // Connect modifiable controls
+  connect(ui->rbIconMono, &QRadioButton::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->sbPort, &QSpinBox::valueChanged, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->comboLogLevel, &QComboBox::currentIndexChanged, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->comboInterface, &QComboBox::currentIndexChanged, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->comboTlsKeyLength, &QComboBox::currentIndexChanged, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->comboLanguage, &QComboBox::currentIndexChanged, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->rbAutoHide, &QRadioButton::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->cbPreventSleep, &QCheckBox::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->rbCloseToTray, &QRadioButton::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->cbElevateDaemon, &QCheckBox::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->cbAutoUpdate, &QCheckBox::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->cbGuiDebug, &QCheckBox::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->cbUseWlClipboard, &QCheckBox::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->cbShowVersion, &QCheckBox::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->cbRequireClientCert, &QCheckBox::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->groupLogToFile, &QGroupBox::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->groupService, &QGroupBox::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->groupSecurity, &QGroupBox::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->lineLogFilename, &QLineEdit::textChanged, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->lineTlsCertPath, &QLineEdit::textChanged, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->cbRunEnterCommand, &QCheckBox::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->cbRunExitCommand, &QCheckBox::toggled, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->lineCommandEnter, &QLineEdit::textChanged, this, &SettingsDialog::setButtonBoxEnabledButtons);
+  connect(ui->lineCommandExit, &QLineEdit::textChanged, this, &SettingsDialog::setButtonBoxEnabledButtons);
 }
 
 void SettingsDialog::regenCertificates()
@@ -165,6 +208,10 @@ void SettingsDialog::updateText()
   ui->comboLogLevel->setItemData(5, tr("Debug entries"), Qt::ToolTipRole);
   ui->comboLogLevel->setItemData(6, tr("More debug output"), Qt::ToolTipRole);
   ui->comboLogLevel->setItemData(7, tr("Verbose debug output"), Qt::ToolTipRole);
+  ui->buttonBox->button(QDialogButtonBox::Save)->setToolTip(tr("Close and save changes"));
+  ui->buttonBox->button(QDialogButtonBox::Cancel)->setToolTip(tr("Close and forget changes"));
+  ui->buttonBox->button(QDialogButtonBox::Reset)->setToolTip(tr("Reset to stored values"));
+  ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setToolTip(tr("Reset to default values"));
 }
 
 void SettingsDialog::accept()
@@ -172,22 +219,26 @@ void SettingsDialog::accept()
   Settings::setValue(Settings::Core::Port, ui->sbPort->value());
   Settings::setValue(Settings::Core::Interface, ui->comboInterface->currentData());
   Settings::setValue(Settings::Log::Level, ui->comboLogLevel->currentIndex());
-  Settings::setValue(Settings::Log::ToFile, ui->cbLogToFile->isChecked());
+  Settings::setValue(Settings::Log::ToFile, ui->groupLogToFile->isChecked());
   Settings::setValue(Settings::Log::File, ui->lineLogFilename->text());
   Settings::setValue(Settings::Daemon::Elevate, ui->cbElevateDaemon->isChecked());
-  Settings::setValue(Settings::Gui::Autohide, ui->cbAutoHide->isChecked());
+  Settings::setValue(Settings::Gui::Autohide, ui->rbAutoHide->isChecked());
   Settings::setValue(Settings::Gui::AutoUpdateCheck, ui->cbAutoUpdate->isChecked());
   Settings::setValue(Settings::Core::PreventSleep, ui->cbPreventSleep->isChecked());
   Settings::setValue(Settings::Security::Certificate, ui->lineTlsCertPath->text());
   Settings::setValue(Settings::Security::KeySize, ui->comboTlsKeyLength->currentText().toInt());
   Settings::setValue(Settings::Security::TlsEnabled, ui->groupSecurity->isChecked());
-  Settings::setValue(Settings::Gui::CloseToTray, ui->cbCloseToTray->isChecked());
+  Settings::setValue(Settings::Gui::CloseToTray, ui->rbCloseToTray->isChecked());
   Settings::setValue(Settings::Gui::SymbolicTrayIcon, ui->rbIconMono->isChecked());
   Settings::setValue(Settings::Security::CheckPeers, ui->cbRequireClientCert->isChecked());
   Settings::setValue(Settings::Core::Language, I18N::nativeTo639Name(ui->comboLanguage->currentText()));
   Settings::setValue(Settings::Log::GuiDebug, ui->cbGuiDebug->isChecked());
   Settings::setValue(Settings::Core::UseWlClipboard, ui->cbUseWlClipboard->isChecked());
   Settings::setValue(Settings::Gui::ShowVersionInTitle, ui->cbShowVersion->isChecked());
+  Settings::setValue(Settings::Core::EnableEnterCommand, ui->cbRunEnterCommand->isChecked());
+  Settings::setValue(Settings::Core::EnableExitCommand, ui->cbRunExitCommand->isChecked());
+  Settings::setValue(Settings::Core::ScreenEnterCommand, ui->lineCommandEnter->text());
+  Settings::setValue(Settings::Core::ScreenExitCommand, ui->lineCommandExit->text());
 
   Settings::ProcessMode mode;
   if (ui->groupService->isChecked())
@@ -203,16 +254,18 @@ void SettingsDialog::loadFromConfig()
 {
   ui->sbPort->setValue(Settings::value(Settings::Core::Port).toInt());
   ui->comboLogLevel->setCurrentIndex(Settings::value(Settings::Log::Level).toInt());
-  ui->cbLogToFile->setChecked(Settings::value(Settings::Log::ToFile).toBool());
+  ui->groupLogToFile->setChecked(Settings::value(Settings::Log::ToFile).toBool());
   ui->lineLogFilename->setText(Settings::value(Settings::Log::File).toString());
-  ui->cbAutoHide->setChecked(Settings::value(Settings::Gui::Autohide).toBool());
   ui->cbPreventSleep->setChecked(Settings::value(Settings::Core::PreventSleep).toBool());
-  ui->cbCloseToTray->setChecked(Settings::value(Settings::Gui::CloseToTray).toBool());
   ui->cbElevateDaemon->setChecked(Settings::value(Settings::Daemon::Elevate).toBool());
   ui->cbAutoUpdate->setChecked(Settings::value(Settings::Gui::AutoUpdateCheck).toBool());
   ui->cbGuiDebug->setChecked(Settings::value(Settings::Log::GuiDebug).toBool());
   ui->cbUseWlClipboard->setChecked(Settings::value(Settings::Core::UseWlClipboard).toBool());
   ui->cbShowVersion->setChecked(Settings::value(Settings::Gui::ShowVersionInTitle).toBool());
+  ui->cbRunEnterCommand->setChecked(Settings::value(Settings::Core::EnableEnterCommand).toBool());
+  ui->cbRunExitCommand->setChecked(Settings::value(Settings::Core::EnableExitCommand).toBool());
+  ui->lineCommandEnter->setText(Settings::value(Settings::Core::ScreenEnterCommand).toString());
+  ui->lineCommandExit->setText(Settings::value(Settings::Core::ScreenExitCommand).toString());
 
   const auto processMode = Settings::value(Settings::Core::ProcessMode).value<Settings::ProcessMode>();
   ui->groupService->setChecked(processMode == Settings::ProcessMode::Service);
@@ -225,13 +278,26 @@ void SettingsDialog::loadFromConfig()
   else
     ui->rbIconColorful->setChecked(true);
 
+  const auto autoHide = Settings::value(Settings::Gui::Autohide).toBool();
+  ui->rbAutoHide->setChecked(autoHide);
+  ui->rbShowOnStart->setChecked(!autoHide);
+
+  const auto closeToTray = Settings::value(Settings::Gui::CloseToTray).toBool();
+  ui->rbCloseToTray->setChecked(closeToTray);
+  ui->rbExitOnClose->setChecked(!closeToTray);
+
   ui->lblDebugWarning->setVisible(Settings::value(Settings::Log::Level).toInt() > 4);
 
   ui->comboInterface->setCurrentText(Settings::value(Settings::Core::Interface).toString());
-  if (ui->comboInterface->currentIndex() < 0)
+  if (ui->comboInterface->currentIndex() <= 0) {
     ui->comboInterface->setCurrentIndex(0);
+    m_interfaceSetOnLoad = false;
+  } else {
+    m_interfaceSetOnLoad = true;
+  }
 
   qDebug() << "load from config done";
+
   updateControls();
 }
 
@@ -269,7 +335,7 @@ void SettingsDialog::updateTlsControlsEnabled()
 
 bool SettingsDialog::isClientMode() const
 {
-  return m_coreProcess.mode() == Settings::CoreMode::Client;
+  return Settings::value(Settings::Core::CoreMode) == Settings::CoreMode::Client;
 }
 
 void SettingsDialog::updateKeyLengthOnFile(const QString &path)
@@ -293,20 +359,26 @@ void SettingsDialog::updateControls()
 {
   const bool writable = Settings::isWritable();
   const bool serviceChecked = ui->groupService->isChecked();
-  const bool logToFile = ui->cbLogToFile->isChecked();
+  const bool logToFile = ui->groupLogToFile->isChecked();
 
   ui->buttonBox->button(QDialogButtonBox::Save)->setEnabled(writable);
 
   ui->sbPort->setEnabled(writable);
   ui->comboInterface->setEnabled(writable);
   ui->comboLogLevel->setEnabled(writable);
-  ui->cbLogToFile->setEnabled(writable);
+  ui->groupLogToFile->setEnabled(writable);
-  ui->cbAutoHide->setEnabled(writable);
+  ui->rbAutoHide->setEnabled(writable);
+  ui->rbShowOnStart->setEnabled(writable);
   ui->cbAutoUpdate->setEnabled(writable);
   ui->cbPreventSleep->setEnabled(writable);
   ui->lineTlsCertPath->setEnabled(writable);
   ui->comboTlsKeyLength->setEnabled(writable);
-  ui->cbCloseToTray->setEnabled(writable);
+  ui->rbCloseToTray->setEnabled(writable);
+  ui->rbExitOnClose->setEnabled(writable);
+  ui->cbRunEnterCommand->setEnabled(writable);
+  ui->cbRunExitCommand->setEnabled(writable);
+  ui->lineCommandEnter->setEnabled(writable && ui->cbRunEnterCommand->isChecked());
+  ui->lineCommandExit->setEnabled(writable && ui->cbRunExitCommand->isChecked());
 
   // Portable mode only ever applies to Windows.
   // Daemon options should only be available on Windows when *not* in portable mode.
@@ -342,4 +414,124 @@ void SettingsDialog::logLevelChanged()
   ui->lblDebugWarning->setVisible(ui->comboLogLevel->currentIndex() > 4);
 }
 
+bool SettingsDialog::isModified() const
+{
+  const auto processMode = Settings::value(Settings::Core::ProcessMode).value<Settings::ProcessMode>();
+  const bool ignoreInterface = !m_interfaceSetOnLoad && (ui->comboInterface->currentIndex() == 0);
+
+  bool modified =
+      (ui->sbPort->value() != Settings::value(Settings::Core::Port).toInt()) ||
+      (ui->comboLogLevel->currentIndex() != Settings::value(Settings::Log::Level).toInt()) ||
+      (ui->groupLogToFile->isChecked() != Settings::value(Settings::Log::ToFile).toBool()) ||
+      (ui->lineLogFilename->text() != Settings::value(Settings::Log::File).toString()) ||
+      (ui->rbAutoHide->isChecked() != Settings::value(Settings::Gui::Autohide).toBool()) ||
+      (ui->cbPreventSleep->isChecked() != Settings::value(Settings::Core::PreventSleep).toBool()) ||
+      (ui->rbCloseToTray->isChecked() != Settings::value(Settings::Gui::CloseToTray).toBool()) ||
+      (ui->cbElevateDaemon->isChecked() != Settings::value(Settings::Daemon::Elevate).toBool()) ||
+      (ui->cbAutoUpdate->isChecked() != Settings::value(Settings::Gui::AutoUpdateCheck).toBool()) ||
+      (ui->cbGuiDebug->isChecked() != Settings::value(Settings::Log::GuiDebug).toBool()) ||
+      (ui->cbUseWlClipboard->isChecked() != Settings::value(Settings::Core::UseWlClipboard).toBool()) ||
+      (ui->cbShowVersion->isChecked() != Settings::value(Settings::Gui::ShowVersionInTitle).toBool()) ||
+      (ui->rbIconMono->isChecked() != Settings::value(Settings::Gui::SymbolicTrayIcon).toBool()) ||
+      (ui->groupService->isChecked() != (processMode == Settings::ProcessMode::Service)) ||
+      (ui->lineTlsCertPath->text() != Settings::value(Settings::Security::Certificate).toString()) ||
+      (ui->comboTlsKeyLength->currentText() != Settings::value(Settings::Security::KeySize).toString()) ||
+      (ui->groupSecurity->isChecked() != Settings::value(Settings::Security::TlsEnabled).toBool()) ||
+      (ui->cbRequireClientCert->isChecked() != Settings::value(Settings::Security::CheckPeers).toBool()) ||
+      (ui->cbRunEnterCommand->isChecked() != Settings::value(Settings::Core::EnableEnterCommand).toBool()) ||
+      (ui->cbRunExitCommand->isChecked() != Settings::value(Settings::Core::EnableExitCommand).toBool()) ||
+      (ui->lineCommandEnter->text() != Settings::value(Settings::Core::ScreenEnterCommand).toString()) ||
+      (ui->lineCommandExit->text() != Settings::value(Settings::Core::ScreenExitCommand).toString()) ||
+      (I18N::nativeTo639Name(ui->comboLanguage->currentText()) != Settings::value(Settings::Core::Language).toString());
+
+  if (!ignoreInterface)
+    modified = modified || ui->comboInterface->currentText() != Settings::value(Settings::Core::Interface).toString();
+  return modified;
+}
+
+bool SettingsDialog::isDefault() const
+{
+  const auto processMode = Settings::defaultValue(Settings::Core::ProcessMode).value<Settings::ProcessMode>();
+
+  return (
+      (ui->sbPort->value() == Settings::defaultValue(Settings::Core::Port).toInt()) &&
+      (ui->comboLogLevel->currentIndex() == Settings::defaultValue(Settings::Log::Level).toInt()) &&
+      (ui->groupLogToFile->isChecked() == Settings::defaultValue(Settings::Log::ToFile).toBool()) &&
+      (ui->lineLogFilename->text() == Settings::defaultValue(Settings::Log::File).toString()) &&
+      (ui->rbAutoHide->isChecked() == Settings::defaultValue(Settings::Gui::Autohide).toBool()) &&
+      (ui->cbPreventSleep->isChecked() == Settings::defaultValue(Settings::Core::PreventSleep).toBool()) &&
+      (ui->rbCloseToTray->isChecked() == Settings::defaultValue(Settings::Gui::CloseToTray).toBool()) &&
+      (ui->cbElevateDaemon->isChecked() == Settings::defaultValue(Settings::Daemon::Elevate).toBool()) &&
+      (ui->cbAutoUpdate->isChecked() == Settings::defaultValue(Settings::Gui::AutoUpdateCheck).toBool()) &&
+      (ui->cbGuiDebug->isChecked() == Settings::defaultValue(Settings::Log::GuiDebug).toBool()) &&
+      (ui->cbUseWlClipboard->isChecked() == Settings::defaultValue(Settings::Core::UseWlClipboard).toBool()) &&
+      (ui->cbShowVersion->isChecked() == Settings::defaultValue(Settings::Gui::ShowVersionInTitle).toBool()) &&
+      (ui->rbIconMono->isChecked() == Settings::defaultValue(Settings::Gui::SymbolicTrayIcon).toBool()) &&
+      (ui->groupService->isChecked() == (processMode == Settings::ProcessMode::Service)) &&
+      (ui->comboInterface->currentIndex() == 0) &&
+      (ui->lineTlsCertPath->text() == Settings::defaultValue(Settings::Security::Certificate).toString()) &&
+      (ui->comboTlsKeyLength->currentText() == Settings::defaultValue(Settings::Security::KeySize).toString()) &&
+      (ui->groupSecurity->isChecked() == Settings::defaultValue(Settings::Security::TlsEnabled).toBool()) &&
+      (ui->cbRequireClientCert->isChecked() == Settings::defaultValue(Settings::Security::CheckPeers).toBool()) &&
+      (ui->lineCommandEnter->text() == Settings::defaultValue(Settings::Core::ScreenEnterCommand).toString()) &&
+      (ui->lineCommandExit->text() == Settings::defaultValue(Settings::Core::ScreenExitCommand).toString()) &&
+      (ui->cbRunEnterCommand->isChecked() == Settings::defaultValue(Settings::Core::EnableEnterCommand).toBool()) &&
+      (ui->cbRunExitCommand->isChecked() == Settings::defaultValue(Settings::Core::EnableExitCommand).toBool()) &&
+      (ui->comboLanguage->currentText() == "English")
+  );
+}
+
+void SettingsDialog::resetToDefault()
+{
+  ui->sbPort->setValue(Settings::defaultValue(Settings::Core::Port).toInt());
+  ui->comboLogLevel->setCurrentIndex(Settings::defaultValue(Settings::Log::Level).toInt());
+  ui->groupLogToFile->setChecked(Settings::defaultValue(Settings::Log::ToFile).toBool());
+  ui->lineLogFilename->setText(Settings::defaultValue(Settings::Log::File).toString());
+  ui->cbPreventSleep->setChecked(Settings::defaultValue(Settings::Core::PreventSleep).toBool());
+  ui->cbElevateDaemon->setChecked(Settings::defaultValue(Settings::Daemon::Elevate).toBool());
+  ui->cbAutoUpdate->setChecked(Settings::defaultValue(Settings::Gui::AutoUpdateCheck).toBool());
+  ui->cbGuiDebug->setChecked(Settings::defaultValue(Settings::Log::GuiDebug).toBool());
+  ui->cbUseWlClipboard->setChecked(Settings::defaultValue(Settings::Core::UseWlClipboard).toBool());
+  ui->cbShowVersion->setChecked(Settings::defaultValue(Settings::Gui::ShowVersionInTitle).toBool());
+  ui->cbRunEnterCommand->setChecked(Settings::defaultValue(Settings::Core::EnableEnterCommand).toBool());
+  ui->cbRunExitCommand->setChecked(Settings::defaultValue(Settings::Core::EnableExitCommand).toBool());
+  ui->lineCommandEnter->setText(Settings::defaultValue(Settings::Core::ScreenEnterCommand).toString());
+  ui->lineCommandExit->setText(Settings::defaultValue(Settings::Core::ScreenExitCommand).toString());
+
+  const auto autoHide = Settings::defaultValue(Settings::Gui::Autohide).toBool();
+  ui->rbCloseToTray->setChecked(autoHide);
+  ui->rbExitOnClose->setChecked(!autoHide);
+
+  const auto closeToTray = Settings::defaultValue(Settings::Gui::CloseToTray).toBool();
+  ui->rbCloseToTray->setChecked(closeToTray);
+  ui->rbExitOnClose->setChecked(!closeToTray);
+
+  const auto processMode = Settings::defaultValue(Settings::Core::ProcessMode).value<Settings::ProcessMode>();
+  ui->groupService->setChecked(processMode == Settings::ProcessMode::Service);
+
+  if (!deskflow::platform::isWindows())
+    ui->groupService->setVisible(false);
+
+  if (Settings::defaultValue(Settings::Gui::SymbolicTrayIcon).toBool())
+    ui->rbIconMono->setChecked(true);
+  else
+    ui->rbIconColorful->setChecked(true);
+
+  ui->lblDebugWarning->setVisible(false);
+
+  ui->comboInterface->setCurrentIndex(0);
+
+  qDebug() << "reset to default values";
+  updateControls();
+  setButtonBoxEnabledButtons();
+}
+
+void SettingsDialog::setButtonBoxEnabledButtons() const
+{
+  const bool modified = isModified();
+  ui->buttonBox->button(QDialogButtonBox::Save)->setEnabled(modified);
+  ui->buttonBox->button(QDialogButtonBox::Reset)->setEnabled(modified);
+  ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(!isDefault());
+}
+
 SettingsDialog::~SettingsDialog() = default;

src/lib/gui/dialogs/SettingsDialog.h

@@ -10,7 +10,6 @@
 #include <QDialog>
 
 #include "gui/config/IServerConfig.h"
-#include "gui/core/CoreProcess.h"
 
 namespace Ui {
 class SettingsDialog;
@@ -19,13 +18,12 @@ class SettingsDialog;
 class SettingsDialog : public QDialog
 {
   using IServerConfig = deskflow::gui::IServerConfig;
-  using CoreProcess = deskflow::gui::CoreProcess;
 
   Q_OBJECT
 
 public:
   void extracted();
-  SettingsDialog(QWidget *parent, const IServerConfig &serverConfig, const CoreProcess &coreProcess);
+  SettingsDialog(QWidget *parent, const IServerConfig &serverConfig);
   ~SettingsDialog() override;
 
 Q_SIGNALS:
@@ -63,7 +61,30 @@ private:
   /// @brief update if the log level warning is shown
   void logLevelChanged();
 
+  /**
+   * @brief isModified
+   * @return true when any client settings in the gui do not match the stored settings values.
+   */
+  bool isModified() const;
+
+  /**
+   * @brief isDefault
+   * @return true if all client settings match the default values
+   */
+  bool isDefault() const;
+
+  /**
+   * @brief Set the gui values to the defalut values for all client settings
+   */
+  void resetToDefault();
+
+  /**
+   * @brief setButtonBoxEnabledButtons
+   * Enable / Disable the button box buttons based on the state of the gui
+   */
+  void setButtonBoxEnabledButtons() const;
+
+  bool m_interfaceSetOnLoad = false;
   std::unique_ptr<Ui::SettingsDialog> ui;
   const IServerConfig &m_serverConfig;
-  const CoreProcess &m_coreProcess;
 };

src/lib/gui/validators/AliasValidator.cpp

@@ -9,7 +9,9 @@
 #include "ComputerNameValidator.h"
 #include "IpAddressValidator.h"
 #include "SpacesValidator.h"
+#include "ValidationError.h"
 
+#include <QLineEdit>
 #include <QRegularExpression>
 
 namespace validators {

src/lib/gui/validators/AliasValidator.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include "LineEditValidator.h"
-#include "ValidationError.h"
 
 namespace validators {
+class ValidationError;
 
 class AliasValidator : public LineEditValidator
 {

src/lib/gui/validators/ComputerNameValidator.cpp

@@ -17,7 +17,9 @@ ComputerNameValidator::ComputerNameValidator(const QString &message) : IStringVa
 
 bool ComputerNameValidator::validate(const QString &input) const
 {
-  auto match = m_nameValidator.match(input);
+  static const auto s_nameValidator =
+      QRegularExpression(QStringLiteral("^[\\w\\._-]{0,255}$"), QRegularExpression::CaseInsensitiveOption);
+  auto match = s_nameValidator.match(input);
   return match.hasMatch();
 }
 

src/lib/gui/validators/ComputerNameValidator.h

@@ -8,8 +8,6 @@
 
 #include "IStringValidator.h"
 
-#include <QRegularExpression>
-
 namespace validators {
 
 class ComputerNameValidator : public IStringValidator
@@ -17,10 +15,6 @@ class ComputerNameValidator : public IStringValidator
 public:
   explicit ComputerNameValidator(const QString &message);
   bool validate(const QString &input) const override;
-
-private:
-  inline static const QRegularExpression m_nameValidator =
-      QRegularExpression(QStringLiteral("^[\\w\\._-]{0,255}$"), QRegularExpression::CaseInsensitiveOption);
 };
 
 } // namespace validators

src/lib/gui/validators/IpAddressValidator.cpp

@@ -5,6 +5,7 @@
  */
 
 #include "IpAddressValidator.h"
+#include <QRegularExpression>
 
 namespace validators {
 

src/lib/gui/validators/IpAddressValidator.h

@@ -7,7 +7,6 @@
 #pragma once
 
 #include "IStringValidator.h"
-#include <QRegularExpression>
 
 namespace validators {
 

src/lib/gui/validators/LineEditValidator.cpp

@@ -6,8 +6,10 @@
  */
 
 #include "LineEditValidator.h"
+#include "ValidationError.h"
 
 #include <QApplication>
+#include <QLineEdit>
 #include <QStyle>
 #include <QValidator>
 

src/lib/gui/validators/LineEditValidator.h

@@ -8,15 +8,14 @@
 
 #include "IStringValidator.h"
 
-#include <QLabel>
-#include <QLineEdit>
 #include <QValidator>
 #include <memory>
 #include <vector>
 
-#include "ValidationError.h"
+class QLineEdit;
 
 namespace validators {
+class ValidationError;
 
 class LineEditValidator : public QValidator
 {

src/lib/gui/validators/ScreenDuplicationsValidator.cpp

@@ -5,6 +5,7 @@
  */
 
 #include "ScreenDuplicationsValidator.h"
+#include "gui/config/ScreenList.h"
 
 namespace validators {
 

src/lib/gui/validators/ScreenDuplicationsValidator.h

@@ -8,7 +8,7 @@
 
 #include "IStringValidator.h"
 
-#include "gui/config/ScreenList.h"
+class ScreenList;
 
 namespace validators {
 

src/lib/gui/validators/ScreenNameValidator.cpp

@@ -12,6 +12,9 @@
 #include "SpacesValidator.h"
 #include "ValidationError.h"
 
+#include "gui/config/ScreenList.h"
+
+#include <QLineEdit>
 #include <QRegularExpression>
 #include <memory>
 

src/lib/gui/validators/ScreenNameValidator.h

@@ -7,11 +7,11 @@
 #pragma once
 
 #include "LineEditValidator.h"
-#include "ValidationError.h"
 
-#include "gui/config/ScreenList.h"
+class ScreenList;
 
 namespace validators {
+class ValidationError;
 
 class ScreenNameValidator : public LineEditValidator
 {

src/lib/gui/validators/SpacesValidator.cpp

@@ -15,7 +15,7 @@ SpacesValidator::SpacesValidator(const QString &message) : IStringValidator(mess
 
 bool SpacesValidator::validate(const QString &input) const
 {
-  return !input.contains(' ');
+  return !input.contains(QChar::Space);
 }
 
 } // namespace validators

src/lib/gui/validators/ValidationError.cpp

@@ -7,6 +7,7 @@
 
 #include "ValidationError.h"
 
+#include <QLabel>
 #include <QPalette>
 
 namespace validators {

src/lib/gui/validators/ValidationError.h

@@ -7,10 +7,11 @@
 
 #pragma once
 
-#include <QLabel>
 #include <QObject>
 #include <QString>
 
+class QLabel;
+
 namespace validators {
 
 class ValidationError : public QObject

src/lib/gui/widgets/NewScreenWidget.cpp

@@ -19,7 +19,7 @@ NewScreenWidget::NewScreenWidget(QWidget *parent) : QLabel(parent)
   // do nothing
 }
 
-void NewScreenWidget::mousePressEvent(QMouseEvent *event)
+void NewScreenWidget::mousePressEvent(QMouseEvent *)
 {
   //: Used as the hostname. Translation may not contain spaces
   Screen newScreen(tr("Unnamed"));

src/lib/gui/widgets/NewScreenWidget.h

@@ -20,5 +20,5 @@ public:
   explicit NewScreenWidget(QWidget *parent);
 
 protected:
-  void mousePressEvent(QMouseEvent *event) override;
+  void mousePressEvent(QMouseEvent *) override;
 };

src/lib/gui/widgets/ScreenSetupView.h

@@ -10,8 +10,6 @@
 #include <QFlags>
 #include <QTableView>
 
-#include "gui/config/Screen.h"
-
 class QWidget;
 class QMouseEvent;
 class QResizeEvent;

src/lib/gui/widgets/StatusBar.cpp

@@ -0,0 +1,178 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 - 2026 Deskflow Developers
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#include "StatusBar.h"
+#include "common/Constants.h"
+#include "common/Settings.h"
+
+#include <QEvent>
+#include <QLabel>
+#include <QPushButton>
+
+StatusBar::StatusBar(QWidget *parent)
+    : QStatusBar{parent},
+      m_btnFingerprint{new QPushButton(this)},
+      m_lblSecurityIcon{new QLabel(this)},
+      m_lblStatus{new QLabel(this)},
+      m_btnUpdate{new QPushButton(this)}
+{
+  static const auto btnHeight = height() - 2;
+  static const auto btnSize = QSize(btnHeight, btnHeight);
+  static const auto iconSize = QSize(fontMetrics().height() + 2, fontMetrics().height() + 2);
+
+  m_btnFingerprint->setFlat(true);
+  m_btnFingerprint->setIcon(QIcon::fromTheme(QStringLiteral("fingerprint")));
+  m_btnFingerprint->setFixedSize(btnSize);
+  m_btnFingerprint->setIconSize(iconSize);
+  insertPermanentWidget(0, m_btnFingerprint);
+  connect(m_btnFingerprint, &QPushButton::clicked, this, &StatusBar::requestShowMyFingerprints);
+
+  m_lblSecurityIcon->setVisible(false);
+  m_lblSecurityIcon->setFixedSize(iconSize);
+  m_lblSecurityIcon->setScaledContents(true);
+  insertPermanentWidget(1, m_lblSecurityIcon);
+
+  m_lblStatus->setText(tr("%1 is not running").arg(kAppName));
+  insertPermanentWidget(2, m_lblStatus, 1);
+
+  m_btnUpdate->setVisible(false);
+  m_btnUpdate->setFlat(true);
+  m_btnUpdate->setLayoutDirection(Qt::RightToLeft);
+  m_btnUpdate->setIcon(QIcon::fromTheme(QStringLiteral("software-updates-release")));
+  m_btnUpdate->setFixedHeight(btnHeight);
+  m_btnUpdate->setIconSize(iconSize);
+  insertPermanentWidget(3, m_btnUpdate);
+  connect(m_btnUpdate, &QPushButton::clicked, this, &StatusBar::requestUpdateVersion);
+
+  updateText();
+  adjustSize();
+}
+
+// clang-format off
+void StatusBar::setStatus(ConnectionState connectionState, ProcessState processState, bool isServer)
+{
+  setSecurityIconVisible(false);
+  switch (processState) {
+    using enum ProcessState;
+    case Starting:
+      m_lblStatus->setText(tr("%1 is starting...").arg(kAppName));
+      break;
+
+    case RetryPending:
+      m_lblStatus->setText(tr("%1 will retry in a moment...").arg(kAppName));
+      break;
+
+    case Stopping:
+      m_lblStatus->setText(tr("%1 is stopping...").arg(kAppName));
+      break;
+
+    case Stopped:
+      m_lblStatus->setText(tr("%1 is not running").arg(kAppName));
+      break;
+
+    case Started: {
+      switch (connectionState) {
+        using enum ConnectionState;
+
+        case Listening: {
+          if (isServer) {
+            setSecurityIconVisible(true);
+            m_lblStatus->setText(tr("%1 is waiting for clients").arg(kAppName));
+          }
+          break;
+        }
+
+        case Connecting:
+          m_lblStatus->setText(tr("%1 is connecting...").arg(kAppName));
+          break;
+
+        case Connected: {
+          setSecurityIconVisible(true);
+          if (!isServer) {
+            m_lblStatus->setText(tr("%1 is connected as client of %2")
+                                     .arg(kAppName, Settings::value(Settings::Client::RemoteHost).toString()));
+          }
+          break;
+        }
+
+        case Disconnected:
+          m_lblStatus->setText(tr("%1 is disconnected").arg(kAppName));
+          break;
+      }
+    }
+  }
+}
+// clang-format on
+void StatusBar::setServerClients(const QStringList &clients)
+{
+  if (clients.isEmpty()) {
+    m_lblStatus->setText(tr("%1 is waiting for clients").arg(kAppName));
+    m_lblStatus->setToolTip("");
+    return;
+  }
+  const auto clientCount = static_cast<int>(clients.size());
+  static const auto comma = QStringLiteral(", ");
+  static const auto newLine = QStringLiteral("\n");
+  //: Shown when in server mode and at least 1 client is connected
+  //: %1 is replaced by the app name
+  //: %2 will be a list of at least one client
+  //: %n will be replaced by the number of clients (n is >=1), it is not requried to be in the translation
+  const auto text = tr("%1 is connected, with %n client(s): %2", "", clientCount).arg(kAppName, clients.join(comma));
+  m_lblStatus->setText(text);
+
+  const auto toolTipString = clientCount == 1 ? "" : tr("Clients:\n %1").arg(clients.join(newLine));
+  m_lblStatus->setToolTip(toolTipString);
+}
+
+void StatusBar::setSecurityIconVisible(bool visible)
+{
+  m_lblSecurityIcon->setVisible(visible);
+}
+
+bool StatusBar::securityIconVisible() const
+{
+  return m_lblSecurityIcon->isVisible();
+}
+
+void StatusBar::setBtnFingerprintVisible(bool visible)
+{
+  m_btnFingerprint->setVisible(visible);
+}
+
+void StatusBar::updateFound(const QString &version)
+{
+  m_btnUpdate->setVisible(true);
+  m_btnUpdate->setToolTip(tr("A new version v%1 is available").arg(version));
+}
+
+void StatusBar::changeEvent(QEvent *e)
+{
+  QStatusBar::changeEvent(e);
+  if (e->type() == QEvent::LanguageChange)
+    updateText();
+}
+
+void StatusBar::updateText()
+{
+  m_btnFingerprint->setToolTip(tr("View local fingerprint"));
+  m_btnUpdate->setText(tr("Update available"));
+  setSecurityLevel(m_securityLevel);
+}
+
+void StatusBar::setSecurityIcon(bool encrypted)
+{
+  const auto icon = QIcon::fromTheme(encrypted ? QIcon::ThemeIcon::SecurityHigh : QIcon::ThemeIcon::SecurityLow);
+  m_lblSecurityIcon->setPixmap(icon.pixmap(QSize(32, 32)));
+  m_encrypted = encrypted;
+  setSecurityLevel(m_securityLevel);
+}
+
+void StatusBar::setSecurityLevel(const QString &securityLevel)
+{
+  m_securityLevel = securityLevel;
+  const auto txt = m_encrypted ? tr("%1 Encryption Enabled").arg(m_securityLevel) : tr("Encryption Disabled");
+  m_lblSecurityIcon->setToolTip(txt);
+}

src/lib/gui/widgets/StatusBar.h

@@ -0,0 +1,49 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 - 2026 Deskflow Developers
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#pragma once
+
+#include <QStatusBar>
+
+#include "common/Enums.h"
+
+class QPushButton;
+class QLabel;
+
+using ProcessState = deskflow::core::ProcessState;
+using ConnectionState = deskflow::core::ConnectionState;
+
+class StatusBar : public QStatusBar
+{
+  Q_OBJECT
+public:
+  explicit StatusBar(QWidget *parent = nullptr);
+  void setStatus(ConnectionState connectionState, ProcessState processState, bool isServer);
+  void setServerClients(const QStringList &clients);
+  void setSecurityIconVisible(bool visible);
+  bool securityIconVisible() const;
+  void updateSecurityInfo(bool encrypted);
+  void setSecurityIcon(bool encrypted);
+  void setSecurityLevel(const QString &securityLevel);
+  void setBtnFingerprintVisible(bool visible);
+  void updateFound(const QString &version);
+
+Q_SIGNALS:
+  void requestShowMyFingerprints();
+  void requestUpdateVersion();
+
+protected:
+  void changeEvent(QEvent *e) override;
+
+private:
+  void updateText();
+  QPushButton *m_btnFingerprint = nullptr;
+  QLabel *m_lblSecurityIcon = nullptr;
+  QLabel *m_lblStatus = nullptr;
+  QPushButton *m_btnUpdate = nullptr;
+  bool m_encrypted = false;
+  QString m_securityLevel;
+};

src/lib/io/StreamFilter.cpp

@@ -81,6 +81,11 @@ deskflow::IStream *StreamFilter::getStream() const
   return m_stream;
 }
 
+bool StreamFilter::adoptedStream() const
+{
+  return m_adopted;
+}
+
 void StreamFilter::filterEvent(const Event &event)
 {
   m_events->dispatchEvent(Event(event.getType(), getEventTarget(), event.getData()));

src/lib/io/StreamFilter.h

@@ -51,6 +51,8 @@ public:
   */
   deskflow::IStream *getStream() const;
 
+  bool adoptedStream() const;
+
 protected:
   //! Handle events from source stream
   /*!

src/lib/net/SecureSocket.cpp

@@ -658,9 +658,9 @@ ISocketMultiplexerJob *SecureSocket::serviceConnect(ISocketMultiplexerJob *const
   Lock lock(&getMutex());
 
   int status = 0;
-#ifdef SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   status = secureConnect(static_cast<int>(getSocket()->m_socket));
-#elif SYSAPI_UNIX
+#else
   status = secureConnect(getSocket()->m_fd);
 #endif
 
@@ -686,13 +686,14 @@ ISocketMultiplexerJob *SecureSocket::serviceAccept(ISocketMultiplexerJob *const,
   Lock lock(&getMutex());
 
   int status = 0;
-#ifdef SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   status = secureAccept(static_cast<int>(getSocket()->m_socket));
-#elif SYSAPI_UNIX
+#else
   status = secureAccept(getSocket()->m_fd);
 #endif
   // If status < 0, error happened
   if (status < 0) {
+    sendEvent(EventTypes::ClientListenerDisconnectedOnAccept);
     return nullptr;
   }
 

src/lib/net/SecureUtils.cpp

@@ -92,7 +92,7 @@ void generatePemSelfSignedCert(const QString &path, int keyLength)
   X509_sign(cert, privateKey, EVP_sha256());
 
   const std::filesystem::path fsPath = path.toStdString();
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   auto fp = _wfopen(fsPath.native().c_str(), L"w");
 #else
   auto fp = std::fopen(fsPath.native().c_str(), "w");

src/lib/net/TCPListenSocket.cpp

@@ -54,7 +54,7 @@ void TCPListenSocket::bind(const NetworkAddress &addr)
   try {
     std::scoped_lock lock{m_mutex};
 
-#if SYSAPI_UNIX
+#if defined(Q_OS_UNIX)
     // Only reuse socket addr on Unix so we can restart the server quickly (Unix holds the port
     // in TIME_WAIT for a few mins after close). This is not needed on Windows and can cause issues
     // because binding to a re-use port makes it look like the server is listening when it is not.

src/lib/platform/CMakeLists.txt

@@ -177,7 +177,7 @@ if(UNIX)
     if(${LIBXKBCOMMON_VERSION} VERSION_GREATER_EQUAL "1.10")
       target_compile_definitions(platform PRIVATE HAVE_XKB_KEYMAP_MOD_GET_MASK=1)
     endif()
-    target_compile_definitions(platform PUBLIC WINAPI_LIBEI WINAPI_LIBPORTAL HAVE_LIBPORTAL_INPUTCAPTURE)
+    target_compile_definitions(platform PUBLIC WINAPI_LIBEI WINAPI_LIBPORTAL)
     target_include_directories(platform PUBLIC ${LIBEI_INCLUDE_DIRS} ${LIBPORTAL_INCLUDE_DIRS})
     target_link_libraries(
       platform

src/lib/platform/MSWindowsClipboard.cpp

@@ -1,5 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2026 Deskflow Developers
  * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
  * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
@@ -116,14 +117,26 @@ bool MSWindowsClipboard::open(Time time) const
 {
   LOG_DEBUG("open clipboard");
 
-  if (!OpenClipboard(m_window)) {
+  // The clipboard is a global mutex on Windows. We aren't always going to
-    LOG_WARN("failed to open clipboard: %d", GetLastError());
+  // get the lock on the first try, so try a few times before giving up.
-    return false;
+  // Based on Chromium's ScopedClipboard::Acquire() retry loop.
+  static const int kMaxRetries = 5;
+  static const int kRetryDelayMs = 5;
+
+  for (int i = 0; i < kMaxRetries; ++i) {
+    if (OpenClipboard(m_window)) {
+      m_time = time;
+      return true;
     }
 
-  m_time = time;
+    if (i < kMaxRetries - 1) {
+      LOG_DEBUG("failed to open clipboard (attempt %d/%d, error=%d), retrying", i + 1, kMaxRetries, GetLastError());
+      Sleep(kRetryDelayMs);
+    }
+  }
 
-  return true;
+  LOG_WARN("failed to open clipboard after %d attempts: %d", kMaxRetries, GetLastError());
+  return false;
 }
 
 void MSWindowsClipboard::close() const

src/lib/platform/OSXAutoTypes.h

@@ -5,7 +5,6 @@
  */
 #pragma once
 
-#if WINAPI_CARBON
 #include <Carbon/Carbon.h>
 #include <memory>
 
@@ -13,5 +12,3 @@ using CFDeallocator = decltype(&CFRelease);
 using AutoCFArray = std::unique_ptr<const __CFArray, CFDeallocator>;
 using AutoCFDictionary = std::unique_ptr<const __CFDictionary, CFDeallocator>;
 using AutoTISInputSourceRef = std::unique_ptr<__TISInputSource, CFDeallocator>;
-
-#endif

src/lib/platform/OSXEventQueueBuffer.cpp

@@ -31,9 +31,10 @@ void OSXEventQueueBuffer::waitForEvent(double timeout)
 {
   std::unique_lock lock(m_mutex);
   if (m_dataQueue.empty()) {
-    auto duration = std::chrono::duration<double>(timeout);
     LOG_DEBUG2("waiting for event, timeout: %f seconds", timeout);
-    m_cond.wait_for(lock, duration, [this] { return !m_dataQueue.empty(); });
+    auto end = timeout < 0 ? std::chrono::steady_clock::time_point::max()
+                           : std::chrono::steady_clock::now() + std::chrono::duration<double>(timeout);
+    m_cond.wait_until(lock, end, [this] { return !m_dataQueue.empty(); });
   } else {
     LOG_DEBUG2("found events in the queue");
   }

src/lib/platform/XWindowsScreen.cpp

@@ -815,7 +815,7 @@ void XWindowsScreen::fakeMouseWheel(ScrollDelta delta) const
   }
 
   // send as many clicks as necessary
-  while (axisDelta >= 0) {
+  while (axisDelta > 0) {
     XTestFakeButtonEvent(m_display, button, True, CurrentTime);
     XTestFakeButtonEvent(m_display, button, False, CurrentTime);
     axisDelta -= s_scrollDelta;

src/lib/server/ClientListener.cpp

@@ -138,6 +138,14 @@ void ClientListener::handleClientConnecting()
       [this, rawSocketPointer](const auto &) { handleClientAccepted(rawSocketPointer); }
   );
 
+  m_events->addHandler(
+      EventTypes::ClientListenerDisconnectedOnAccept, rawSocketPointer->getEventTarget(),
+      [this, rawSocketPointer](const auto &) {
+        LOG_DEBUG("disconnected client before accept");
+        removeClientSocket(rawSocketPointer);
+      }
+  );
+
   // When using non SSL, server accepts clients immediately, while SSL
   // has to call secure accept which may require retry
   if (m_securityLevel == SecurityLevel::PlainText) {
@@ -163,7 +171,15 @@ void ClientListener::handleClientAccepted(IDataSocket *socket)
     handleUnknownClient(client);
   });
   m_events->addHandler(EventTypes::ClientProxyUnknownFailure, client, [this, client](const auto &) {
+    auto *filter = dynamic_cast<StreamFilter *>(client->getStream());
+    IDataSocket *socket = nullptr;
+    if (filter && !filter->adoptedStream()) {
+      socket = dynamic_cast<IDataSocket *>(filter->getStream());
+    }
     removeUnknownClient(client);
+    if (socket) {
+      removeClientSocket(socket);
+    }
   });
 }
 
@@ -205,14 +221,20 @@ void ClientListener::handleClientDisconnected(ClientProxy *client)
       // we know which socket we no longer need
       auto *socket = static_cast<IDataSocket *>(client->getStream());
       delete client;
-      m_clientSockets.erase(socket);
+      removeClientSocket(socket);
-      delete socket;
 
       break;
     }
   }
 }
 
+void ClientListener::removeClientSocket(IDataSocket *socket)
+{
+  m_clientSockets.erase(socket);
+  m_events->removeHandlers(socket->getEventTarget());
+  delete socket;
+}
+
 void ClientListener::cleanupListenSocket()
 {
   delete m_listen;

src/lib/server/ClientListener.h

@@ -71,6 +71,7 @@ private:
   void handleUnknownClient(ClientProxyUnknown *unknownClient);
   void handleClientDisconnected(ClientProxy *client);
 
+  void removeClientSocket(IDataSocket *socket);
   void cleanupListenSocket();
   void cleanupClientSockets();
   void start();

src/lib/server/Config.h

@@ -199,7 +199,7 @@ public:
 
   //! Add screen
   /*!
-  Adds a screen, returning true iff successful.  If a screen or
+  Adds a screen, returning true if successful.  If a screen or
   alias with the given name exists then it fails.
   */
   bool addScreen(const std::string &name);

src/unittests/legacytests/legacytests/main.cpp

@@ -9,7 +9,7 @@
 #include "base/Log.h"
 #include "unittests/legacytests/shared/ExitTimeout.h"
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
 #include "arch/win32/ArchMiscWindows.h"
 #endif
 
@@ -23,7 +23,7 @@ int main(int argc, char **argv)
 {
   ExitTimeout exitTimeout(1, "Unit tests");
 
-#if SYSAPI_WIN32
+#if defined(Q_OS_WIN)
   // HACK: shouldn't be needed, but logging fails without this.
   ArchMiscWindows::setInstanceWin32(GetModuleHandle(nullptr));
 #endif

translations/deskflow_en.ts

@@ -2,7 +2,7 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="en_US">
 <context>
-    <name>MainWindow</name>
+    <name>StatusBar</name>
     <message numerus="yes">
         <source>%1 is connected, with %n client(s): %2</source>
         <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>

translations/deskflow_es.ts

@@ -386,22 +386,14 @@ Do you want to connect to the server?
         <extracomment>stop core shortcut</extracomment>
         <translation type="unfinished">Ctrl+T</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;Failed to connect to the server &apos;%1&apos;.&lt;/p&gt;&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Error al conectar con el servidor &apos;%1&apos;.&lt;/p&gt;&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</translation>
+    </message>
     <message>
         <source>Your current TLS key is smaller than the minimum allowed size, A new key 2048-bit key will be generated.</source>
         <translation type="unfinished">Su clave TLS actual es más pequeña que el tamaño mínimo permitido. Se generará una nueva clave de 2048 bits.</translation>
     </message>
-    <message>
-        <source>View local fingerprint</source>
-        <translation type="unfinished">Ver huella digital local</translation>
-    </message>
-    <message>
-        <source>Update available</source>
-        <translation type="unfinished">Actualización disponible</translation>
-    </message>
-    <message>
-        <source>A new version v%1 is available</source>
-        <translation type="unfinished">Ya está disponible una nueva versión v%1</translation>
-    </message>
     <message>
         <source>Address missing</source>
         <translation type="unfinished">Dirección faltante</translation>
@@ -410,10 +402,6 @@ Do you want to connect to the server?
         <source>Please enter the hostname or IP address of the other computer.</source>
         <translation type="unfinished">Introduzca el nombre de host o la dirección IP de la otra computadora.</translation>
     </message>
-    <message>
-        <source>Core cannot be started</source>
-        <translation type="unfinished">No se puede iniciar el núcleo</translation>
-    </message>
     <message>
         <source>Save server configuration as...</source>
         <translation type="unfinished">Guardar la configuración del servidor como...</translation>
@@ -443,12 +431,8 @@ Do you want to connect to the server?
         <translation type="unfinished">Desconectar</translation>
     </message>
     <message>
-        <source>%1 Encryption Enabled</source>
+        <source>%1 Connection Error</source>
-        <translation type="unfinished">%1 Cifrado habilitado</translation>
+        <translation>%1 Error de conexión</translation>
-    </message>
-    <message>
-        <source>Encryption Disabled</source>
-        <translation type="unfinished">Cifrado deshabilitado</translation>
     </message>
     <message>
         <source>No IP Detected</source>
@@ -500,42 +484,10 @@ La dirección IP asignada ahora no es válida; es posible que deba reiniciar el
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Ayuda</translation>
     </message>
-    <message>
-        <source>%1 is starting...</source>
-        <translation type="unfinished">%1 está iniciando...</translation>
-    </message>
     <message>
         <source>invalid certificate, generating a new one</source>
         <translation type="unfinished">certificado no válido, generando uno nuevo</translation>
     </message>
-    <message>
-        <source>%1 will retry in a moment...</source>
-        <translation type="unfinished">%1 lo intentará nuevamente en un momento...</translation>
-    </message>
-    <message>
-        <source>%1 is stopping...</source>
-        <translation type="unfinished">%1 se está deteniendo...</translation>
-    </message>
-    <message>
-        <source>%1 is not running</source>
-        <translation type="unfinished">%1 no se está ejecutando</translation>
-    </message>
-    <message>
-        <source>%1 is waiting for clients</source>
-        <translation type="unfinished">%1 está esperando clientes</translation>
-    </message>
-    <message>
-        <source>%1 is connecting...</source>
-        <translation type="unfinished">%1 se está conectando...</translation>
-    </message>
-    <message>
-        <source>%1 is connected as client of %2</source>
-        <translation type="unfinished">%1 está conectado como cliente de %2</translation>
-    </message>
-    <message>
-        <source>%1 is disconnected</source>
-        <translation type="unfinished">%1 está desconectado</translation>
-    </message>
     <message>
         <source>Ctrl+Q</source>
         <extracomment>Quit shortcut</extracomment>
@@ -562,29 +514,11 @@ Nombres válidos:
 • Use letras y números
 • También puede usar _ o -
 • Tengan entre 1 y 255 caracteres</translation>
-    </message>
-    <message numerus="yes">
-        <source>%1 is connected, with %n client(s): %2</source>
-        <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>
-        <translation type="unfinished">
-            <numerusform>%1 está conectado, con un cliente: %2</numerusform>
-            <numerusform>%1 está conectado, con %n clientes: %2</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Clients:
- %1</source>
-        <translation type="unfinished">Clientes:
- %1</translation>
     </message>
     <message>
         <source>This computer&apos;s name:</source>
         <translation type="unfinished">Nombre de esta computadora:</translation>
     </message>
-    <message>
-        <source>The Core executable could not be successfully started, although it does exist. Please check if you have sufficient permissions to run this program.</source>
-        <translation type="unfinished">No se pudo iniciar el archivo ejecutable principal, aunque existe. Compruebe si tiene permisos suficientes para ejecutar este programa.</translation>
-    </message>
     <message>
         <source>&amp;Configure Client</source>
         <translation type="unfinished">&amp;Configurar cliente</translation>
@@ -595,7 +529,27 @@ Nombres válidos:
     </message>
     <message>
         <source>&lt;html&gt;Hostname or IP address of the server computer.&lt;br/&gt;May contain a comma seperated list.&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;Nome host o indirizzo IP del computer server.&lt;br/&gt;Può contenere un elenco separato da virgole.&lt;/html&gt;</translation>
+        <translation type="unfinished">&lt;html&gt;Nombre de host o dirección IP del servidor.&lt;br/&gt;Puede contener una lista separada por comas.&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished">leer</translation>
+    </message>
+    <message>
+        <source>read and write</source>
+        <translation type="unfinished">leer y escribir</translation>
+    </message>
+    <message>
+        <source>The Core executable could not be started.
+Please check if you have sufficient permissions to run %1.</source>
+        <translation type="unfinished">No se pudo iniciar el ejecutable Core.
+Verifique si tiene permisos suficientes para ejecutar %1.</translation>
+    </message>
+    <message>
+        <source>
+Additionally, check you are able to %1 the server config file: %2</source>
+        <translation type="unfinished">
+Además, verifique que puede %1 el archivo de configuración del servidor: %2</translation>
     </message>
 </context>
 <context>
@@ -676,30 +630,6 @@ Nombres válidos:
         <source>%1 Connected</source>
         <translation type="unfinished">%1 Conectado</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Failed to connect to the server &apos;%1&apos;.&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;Error al conectar con el servidor &apos;%1&apos;.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;Ya hay un cliente conectado al servidor con su nombre.&lt;/p&gt;Asegúrese de utilizar un nombre único y de que solo se esté ejecutando una única instancia del proceso del cliente.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please try to connect to the server using the server IP address instead of the hostname. &lt;/p&gt;&lt;p&gt;If that doesn&apos;t work, please check your TLS and firewall settings.&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;Intente conectarse al servidor usando la dirección IP del servidor en lugar del nombre de host.&lt;/p&gt;&lt;p&gt;Si eso no funciona, verifique la configuración de TLS y firewall.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please check your TLS and firewall settings.&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;Por favor revise su configuración de TLS y firewall.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>%1 Connection Error</source>
-        <translation type="unfinished">%1 Error de conexión</translation>
-    </message>
-    <message>
-        <source>Do not show this message again</source>
-        <translation type="unfinished">No volver a mostrar este mensaje</translation>
-    </message>
     <message>
         <source>%1 - New Client</source>
         <translation type="unfinished">%1 - Nuevo cliente</translation>
@@ -736,10 +666,6 @@ Nombres válidos:
         <source>&lt;p&gt;Settings are read-only because you only have read access to the file:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Las configuraciones son de solo lectura porque solo tiene acceso de lectura al archivo:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.&lt;/p&gt;&lt;p&gt;Please either switch to X from your login screen or use a build that uses the correct libraries.&lt;/p&gt;&lt;p&gt;If you think this is incorrect, please &lt;a href=&quot;%2&quot;&gt;report a bug&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Please check the logs for more information.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Lo sentimos, aunque esta versión de %1 es compatible con Wayland, esta compilación no se vinculó con una o más de las bibliotecas requeridas.&lt;/p&gt;&lt;p&gt;Cambie a X desde su pantalla de inicio de sesión o use una compilación que use las bibliotecas correctas.&lt;/p&gt;&lt;p&gt;Si cree que esto es incorrecto, &lt;a href=&quot;%2&quot;&gt;informe un error&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Consulte los registros para obtener más información.&lt;/p&gt;</translation>
-    </message>
     <message>
         <source>No thanks</source>
         <translation type="unfinished">No, gracias</translation>
@@ -1151,30 +1077,14 @@ Al habilitar esta opción, se deshabilitará la interfaz gráfica de usuario (GU
         <source>Preferences</source>
         <translation type="unfinished">Preferencias</translation>
     </message>
-    <message>
-        <source>&amp;Regular</source>
-        <translation type="unfinished">&amp;Regular</translation>
-    </message>
-    <message>
-        <source>App</source>
-        <translation type="unfinished">Aplicación</translation>
-    </message>
     <message>
         <source>Check for updates on startup</source>
         <translation type="unfinished">Buscar actualizaciones al iniciar</translation>
     </message>
-    <message>
-        <source>Hide the window when the app starts</source>
-        <translation type="unfinished">Ocultar la ventana cuando se inicia la aplicación</translation>
-    </message>
     <message>
         <source>Prevent this computer from going to sleep</source>
         <translation type="unfinished">Evitar que esta computadora entre en modo de suspensión</translation>
     </message>
-    <message>
-        <source>Leave app running in notification area when the window is closed</source>
-        <translation type="unfinished">Dejar la aplicación ejecutándose en el área de notificación cuando la ventana esté cerrada</translation>
-    </message>
     <message>
         <source>Tray icon style</source>
         <translation type="unfinished">Estilo de icono de bandeja</translation>
@@ -1211,10 +1121,6 @@ Al habilitar esta opción, se deshabilitará la interfaz gráfica de usuario (GU
         <source>&amp;Advanced</source>
         <translation type="unfinished">&amp;Avanzado</translation>
     </message>
-    <message>
-        <source>Networking</source>
-        <translation type="unfinished">Redes</translation>
-    </message>
     <message>
         <source>Port</source>
         <translation type="unfinished">Puerto</translation>
@@ -1223,18 +1129,10 @@ Al habilitar esta opción, se deshabilitará la interfaz gráfica de usuario (GU
         <source>Network IP</source>
         <translation type="unfinished">IP de red</translation>
     </message>
-    <message>
-        <source>Logs</source>
-        <translation type="unfinished">Registros</translation>
-    </message>
     <message>
         <source>Log path</source>
         <translation type="unfinished">Ruta de registro</translation>
     </message>
-    <message>
-        <source>Log to file</source>
-        <translation type="unfinished">Registrar en archivo</translation>
-    </message>
     <message>
         <source>Fatal</source>
         <translation type="unfinished">Fatal</translation>
@@ -1315,6 +1213,22 @@ Al habilitar esta opción, se deshabilitará la interfaz gráfica de usuario (GU
         <source>Verbose debug output</source>
         <translation type="unfinished">Salida de depuración detallada</translation>
     </message>
+    <message>
+        <source>Close and save changes</source>
+        <translation type="unfinished">Cerrar y guardar los cambios</translation>
+    </message>
+    <message>
+        <source>Close and forget changes</source>
+        <translation type="unfinished">Cerrar y olvidar los cambios</translation>
+    </message>
+    <message>
+        <source>Reset to stored values</source>
+        <translation type="unfinished">Restablecer los valores almacenados</translation>
+    </message>
+    <message>
+        <source>Reset to default values</source>
+        <translation type="unfinished">Restablecer valores predeterminados</translation>
+    </message>
     <message>
         <source>TLS Certificate Regenerated</source>
         <translation type="unfinished">Certificado TLS regenerado</translation>
@@ -1335,10 +1249,6 @@ Al habilitar esta opción, se deshabilitará la interfaz gráfica de usuario (GU
         <source>Language</source>
         <translation type="unfinished">Idioma</translation>
     </message>
-    <message>
-        <source>Force a language to be used for the GUI.</source>
-        <translation type="unfinished">Fuerza el uso de un idioma para la interfaz gráfica de usuario.</translation>
-    </message>
     <message>
         <source>Enable GUI debug messages</source>
         <translation type="unfinished">Habilitar mensajes de depuración de la interfaz gráfica de usuario</translation>
@@ -1359,6 +1269,123 @@ Al habilitar esta opción, se deshabilitará la interfaz gráfica de usuario (GU
         <source>Include version in the window title</source>
         <translation type="unfinished">Incluir la versión en el título de la ventana</translation>
     </message>
+    <message>
+        <source>Log to file</source>
+        <translation>Registrar en archivo</translation>
+    </message>
+    <message>
+        <source>&amp;Logs</source>
+        <translation>&amp;Registro</translation>
+    </message>
+    <message>
+        <source>&amp;General</source>
+        <translation type="unfinished">&amp;General</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>R&amp;ed</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Ventana</translation>
+    </message>
+    <message>
+        <source>When the main window is closed</source>
+        <translation type="unfinished">Cuando la ventana principal está cerrada</translation>
+    </message>
+    <message>
+        <source>Exit</source>
+        <translation type="unfinished">Salir</translation>
+    </message>
+    <message>
+        <source>Send to background</source>
+        <translation type="unfinished">Enviar a segundo plano</translation>
+    </message>
+    <message>
+        <source>When the application starts</source>
+        <translation type="unfinished">Cuando se inicia la aplicación</translation>
+    </message>
+    <message>
+        <source>Show the main window</source>
+        <translation type="unfinished">Mostrar la ventana principal</translation>
+    </message>
+    <message>
+        <source>Run command on enter</source>
+        <translation type="unfinished">Ejecutar comando al presionar Enter</translation>
+    </message>
+    <message>
+        <source>Run command on exit</source>
+        <translation type="unfinished">Ejecutar comando al salir</translation>
+    </message>
+</context>
+<context>
+    <name>StatusBar</name>
+    <message>
+        <source>%1 is not running</source>
+        <translation type="unfinished">%1 no se está ejecutando</translation>
+    </message>
+    <message>
+        <source>%1 is starting...</source>
+        <translation type="unfinished">%1 está iniciando...</translation>
+    </message>
+    <message>
+        <source>%1 will retry in a moment...</source>
+        <translation type="unfinished">%1 lo intentará nuevamente en un momento...</translation>
+    </message>
+    <message>
+        <source>%1 is stopping...</source>
+        <translation type="unfinished">%1 se está deteniendo...</translation>
+    </message>
+    <message>
+        <source>%1 is waiting for clients</source>
+        <translation type="unfinished">%1 está esperando clientes</translation>
+    </message>
+    <message>
+        <source>%1 is connecting...</source>
+        <translation type="unfinished">%1 se está conectando...</translation>
+    </message>
+    <message>
+        <source>%1 is connected as client of %2</source>
+        <translation type="unfinished">%1 está conectado como cliente de %2</translation>
+    </message>
+    <message>
+        <source>%1 is disconnected</source>
+        <translation type="unfinished">%1 está desconectado</translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 is connected, with %n client(s): %2</source>
+        <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>
+        <translation>
+            <numerusform>%1 está conectado, con un cliente: %2</numerusform>
+            <numerusform>%1 está conectado, con %n clientes: %2</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Clients:
+ %1</source>
+        <translation type="unfinished">Clientes:
+ %1</translation>
+    </message>
+    <message>
+        <source>A new version v%1 is available</source>
+        <translation type="unfinished">Ya está disponible una nueva versión v%1</translation>
+    </message>
+    <message>
+        <source>View local fingerprint</source>
+        <translation type="unfinished">Ver huella digital local</translation>
+    </message>
+    <message>
+        <source>Update available</source>
+        <translation type="unfinished">Actualización disponible</translation>
+    </message>
+    <message>
+        <source>%1 Encryption Enabled</source>
+        <translation type="unfinished">%1 Cifrado habilitado</translation>
+    </message>
+    <message>
+        <source>Encryption Disabled</source>
+        <translation type="unfinished">Cifrado deshabilitado</translation>
+    </message>
 </context>
 <context>
     <name>i18n</name>

translations/deskflow_it.ts

@@ -374,22 +374,14 @@ Vuoi connetterti al server?
         <extracomment>stop core shortcut</extracomment>
         <translation>Ctrl+F</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;Failed to connect to the server &apos;%1&apos;.&lt;/p&gt;&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Impossibile connettersi al server &quot;%1&quot;.&lt;/p&gt;&lt;p&gt;Un client con il tuo nome è già connesso al server.&lt;/p&gt;Assicurati di utilizzare un nome univoco e che sia in esecuzione una sola istanza del processo client.&lt;/p&gt;</translation>
+    </message>
     <message>
         <source>Your current TLS key is smaller than the minimum allowed size, A new key 2048-bit key will be generated.</source>
         <translation>La tua chiave TLS attuale è più piccola della dimensione minima consentita. Verrà generata una nuova chiave a 2048 bit.</translation>
     </message>
-    <message>
-        <source>View local fingerprint</source>
-        <translation>Visualizza impronta digitale locale</translation>
-    </message>
-    <message>
-        <source>Update available</source>
-        <translation>Aggiornamento disponibile</translation>
-    </message>
-    <message>
-        <source>A new version v%1 is available</source>
-        <translation>È disponibile una nuova versione v%1</translation>
-    </message>
     <message>
         <source>Address missing</source>
         <translation>Indirizzo mancante</translation>
@@ -398,10 +390,6 @@ Vuoi connetterti al server?
         <source>Please enter the hostname or IP address of the other computer.</source>
         <translation>Inserisci l&apos;hostname o l&apos;indirizzo IP dell&apos;altro computer.</translation>
     </message>
-    <message>
-        <source>Core cannot be started</source>
-        <translation>Impossibile avviare il core</translation>
-    </message>
     <message>
         <source>Save server configuration as...</source>
         <translation>Salva configurazione server come...</translation>
@@ -431,12 +419,8 @@ Vuoi connetterti al server?
         <translation>Disconnetti</translation>
     </message>
     <message>
-        <source>%1 Encryption Enabled</source>
+        <source>%1 Connection Error</source>
-        <translation>%1 Crittografia abilitata</translation>
+        <translation>Errore di connessione %1</translation>
-    </message>
-    <message>
-        <source>Encryption Disabled</source>
-        <translation>Crittografia disabilitata</translation>
     </message>
     <message>
         <source>No IP Detected</source>
@@ -502,48 +486,10 @@ Nomi validi:
 • Può anche usare _ o - 
 • Deve essere compreso tra 1 e 255 caratteri</translation>
     </message>
-    <message>
-        <source>Clients:
- %1</source>
-        <translation>Client:
- %1</translation>
-    </message>
-    <message>
-        <source>%1 is starting...</source>
-        <translation>%1 si sta avviando...</translation>
-    </message>
     <message>
         <source>invalid certificate, generating a new one</source>
         <translation type="unfinished">certificato non valido, ne viene generato uno nuovo</translation>
     </message>
-    <message>
-        <source>%1 will retry in a moment...</source>
-        <translation>%1 riproverà tra un momento...</translation>
-    </message>
-    <message>
-        <source>%1 is stopping...</source>
-        <translation>%1 si sta arrestando...</translation>
-    </message>
-    <message>
-        <source>%1 is not running</source>
-        <translation>%1 non è in esecuzione</translation>
-    </message>
-    <message>
-        <source>%1 is waiting for clients</source>
-        <translation>%1 è in attesa di client</translation>
-    </message>
-    <message>
-        <source>%1 is connecting...</source>
-        <translation>%1 è in connessione...</translation>
-    </message>
-    <message>
-        <source>%1 is connected as client of %2</source>
-        <translation>%1 è connesso come client di %2</translation>
-    </message>
-    <message>
-        <source>%1 is disconnected</source>
-        <translation>%1 è disconnesso</translation>
-    </message>
     <message>
         <source>Ctrl+Q</source>
         <extracomment>Quit shortcut</extracomment>
@@ -557,14 +503,6 @@ Nomi validi:
         <source>Screen name already exists</source>
         <translation>Il nome dello schermo esiste già</translation>
     </message>
-    <message numerus="yes">
-        <source>%1 is connected, with %n client(s): %2</source>
-        <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>
-        <translation>
-            <numerusform>%1 è connesso con un client %2</numerusform>
-            <numerusform>%1 è connesso con %n client: %2</numerusform>
-        </translation>
-    </message>
     <message>
         <source>This computer&apos;s name:</source>
         <translation>Nome di questo computer:</translation>
@@ -581,10 +519,6 @@ Nomi validi:
         <translation>Usa mouse e tastiera di un altro computer
 (imposta questo computer come client)</translation>
     </message>
-    <message>
-        <source>The Core executable could not be successfully started, although it does exist. Please check if you have sufficient permissions to run this program.</source>
-        <translation type="unfinished">Non è stato possibile avviare correttamente l&apos;eseguibile Core, sebbene esista. Verifica di disporre delle autorizzazioni necessarie per eseguire questo programma.</translation>
-    </message>
     <message>
         <source>&amp;Configure Client</source>
         <translation type="unfinished">&amp;Configurare il client</translation>
@@ -597,6 +531,26 @@ Nomi validi:
         <source>&lt;html&gt;Hostname or IP address of the server computer.&lt;br/&gt;May contain a comma seperated list.&lt;/html&gt;</source>
         <translation type="unfinished">&lt;html&gt;Nome host o indirizzo IP del computer server.&lt;br/&gt;Può contenere un elenco separato da virgole.&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished">leggere</translation>
+    </message>
+    <message>
+        <source>read and write</source>
+        <translation type="unfinished">leggere e scrivere</translation>
+    </message>
+    <message>
+        <source>The Core executable could not be started.
+Please check if you have sufficient permissions to run %1.</source>
+        <translation type="unfinished">Impossibile avviare l&apos;eseguibile Core.
+Verifica di avere i permessi sufficienti per eseguire %1.</translation>
+    </message>
+    <message>
+        <source>
+Additionally, check you are able to %1 the server config file: %2</source>
+        <translation type="unfinished">
+Inoltre, verifica di poter %1 il file di configurazione del server: %2</translation>
+    </message>
 </context>
 <context>
     <name>NewScreenWidget</name>
@@ -676,30 +630,6 @@ Nomi validi:
         <source>%1 Connected</source>
         <translation>%1 Connesso</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Failed to connect to the server &apos;%1&apos;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Impossibile connettersi al server &quot;%1&quot;.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Un client con il tuo nome è già connesso al server.&lt;/p&gt;Assicurati di utilizzare un nome univoco e che sia in esecuzione una sola istanza del processo client.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please try to connect to the server using the server IP address instead of the hostname. &lt;/p&gt;&lt;p&gt;If that doesn&apos;t work, please check your TLS and firewall settings.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Prova a connetterti al server usando l&apos;indirizzo IP del server invece del nome host.&lt;/p&gt;&lt;p&gt;Se non funziona, controlla le impostazioni TLS e del firewall.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please check your TLS and firewall settings.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Controlla le impostazioni TLS e del firewall.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>%1 Connection Error</source>
-        <translation>Errore di connessione %1</translation>
-    </message>
-    <message>
-        <source>Do not show this message again</source>
-        <translation>Non mostrare più questo messaggio</translation>
-    </message>
     <message>
         <source>%1 - New Client</source>
         <translation>%1 - Nuovo Client</translation>
@@ -736,10 +666,6 @@ Nomi validi:
         <source>&lt;p&gt;Settings are read-only because you only have read access to the file:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</source>
         <translation>&lt;p&gt;Le impostazioni sono di sola lettura perché hai solo accesso in lettura al file:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.&lt;/p&gt;&lt;p&gt;Please either switch to X from your login screen or use a build that uses the correct libraries.&lt;/p&gt;&lt;p&gt;If you think this is incorrect, please &lt;a href=&quot;%2&quot;&gt;report a bug&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Please check the logs for more information.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Siamo spiacenti, sebbene questa versione di %1 supporti Wayland, questa build non è stata collegata a una o più librerie richieste.&lt;/p&gt;&lt;p&gt;Passa a X dalla schermata di accesso o usa una build che utilizzi le librerie corrette.&lt;/p&gt;&lt;p&gt;Se ritieni che ciò sia errato, &lt;a href=&quot;%2&quot;&gt;segnala un bug&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Controlla i log per maggiori informazioni.&lt;/p&gt;</translation>
-    </message>
     <message>
         <source>No thanks</source>
         <translation>No, grazie</translation>
@@ -1151,30 +1077,14 @@ L&apos;abilitazione di questa impostazione disabiliterà l&apos;interfaccia graf
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
-    <message>
-        <source>&amp;Regular</source>
-        <translation>&amp;Regolare</translation>
-    </message>
-    <message>
-        <source>App</source>
-        <translation>App</translation>
-    </message>
     <message>
         <source>Check for updates on startup</source>
         <translation>Controlla aggiornamenti all&apos;avvio</translation>
     </message>
-    <message>
-        <source>Hide the window when the app starts</source>
-        <translation>Nascondi la finestra all&apos;avvio dell&apos;app</translation>
-    </message>
     <message>
         <source>Prevent this computer from going to sleep</source>
         <translation>Impedisci a questo computer di andare in sospensione</translation>
     </message>
-    <message>
-        <source>Leave app running in notification area when the window is closed</source>
-        <translation>Lascia l&apos;app in esecuzione nell&apos;area di notifica quando la finestra viene chiusa</translation>
-    </message>
     <message>
         <source>Tray icon style</source>
         <translation>Stile icona di notifica</translation>
@@ -1211,10 +1121,6 @@ L&apos;abilitazione di questa impostazione disabiliterà l&apos;interfaccia graf
         <source>&amp;Advanced</source>
         <translation>&amp;Avanzate</translation>
     </message>
-    <message>
-        <source>Networking</source>
-        <translation>Rete</translation>
-    </message>
     <message>
         <source>Port</source>
         <translation>Porta</translation>
@@ -1223,18 +1129,10 @@ L&apos;abilitazione di questa impostazione disabiliterà l&apos;interfaccia graf
         <source>Network IP</source>
         <translation>IP di rete</translation>
     </message>
-    <message>
-        <source>Logs</source>
-        <translation>Log</translation>
-    </message>
     <message>
         <source>Log path</source>
         <translation>Percorso log</translation>
     </message>
-    <message>
-        <source>Log to file</source>
-        <translation>Salva log su file</translation>
-    </message>
     <message>
         <source>Fatal</source>
         <translation>Fatale</translation>
@@ -1315,6 +1213,22 @@ L&apos;abilitazione di questa impostazione disabiliterà l&apos;interfaccia graf
         <source>Verbose debug output</source>
         <translation>Output di debug dettagliato</translation>
     </message>
+    <message>
+        <source>Close and save changes</source>
+        <translation type="unfinished">Chiudi e salva le modifiche</translation>
+    </message>
+    <message>
+        <source>Close and forget changes</source>
+        <translation type="unfinished">Chiudi e dimentica le modifiche</translation>
+    </message>
+    <message>
+        <source>Reset to stored values</source>
+        <translation type="unfinished">Ripristina i valori memorizzati</translation>
+    </message>
+    <message>
+        <source>Reset to default values</source>
+        <translation type="unfinished">Ripristina i valori predefiniti</translation>
+    </message>
     <message>
         <source>TLS Certificate Regenerated</source>
         <translation>Certificato TLS rigenerato</translation>
@@ -1335,10 +1249,6 @@ L&apos;abilitazione di questa impostazione disabiliterà l&apos;interfaccia graf
         <source>Language</source>
         <translation>Lingua</translation>
     </message>
-    <message>
-        <source>Force a language to be used for the GUI.</source>
-        <translation>Forza l&apos;utilizzo di una lingua per la GUI.</translation>
-    </message>
     <message>
         <source>Enable GUI debug messages</source>
         <translation>Abilita i messaggi di debug della GUI</translation>
@@ -1359,6 +1269,123 @@ L&apos;abilitazione di questa impostazione disabiliterà l&apos;interfaccia graf
         <source>Include version in the window title</source>
         <translation type="unfinished">Includi la versione nel titolo della finestra</translation>
     </message>
+    <message>
+        <source>Log to file</source>
+        <translation>Salva log su file</translation>
+    </message>
+    <message>
+        <source>&amp;Logs</source>
+        <translation>&amp;Logs</translation>
+    </message>
+    <message>
+        <source>&amp;General</source>
+        <translation type="unfinished">&amp;Generale</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>&amp;Rete</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Finestra</translation>
+    </message>
+    <message>
+        <source>When the main window is closed</source>
+        <translation type="unfinished">Quando la finestra principale è chiusa</translation>
+    </message>
+    <message>
+        <source>Exit</source>
+        <translation type="unfinished">Esci</translation>
+    </message>
+    <message>
+        <source>Send to background</source>
+        <translation type="unfinished">Invia in background</translation>
+    </message>
+    <message>
+        <source>When the application starts</source>
+        <translation type="unfinished">Quando l&apos;applicazione si avvia</translation>
+    </message>
+    <message>
+        <source>Show the main window</source>
+        <translation type="unfinished">Mostra la finestra principale</translation>
+    </message>
+    <message>
+        <source>Run command on enter</source>
+        <translation type="unfinished">Esegui il comando alla pressione di Invio</translation>
+    </message>
+    <message>
+        <source>Run command on exit</source>
+        <translation type="unfinished">Esegui comando all&apos;uscita</translation>
+    </message>
+</context>
+<context>
+    <name>StatusBar</name>
+    <message>
+        <source>%1 is not running</source>
+        <translation>%1 non è in esecuzione</translation>
+    </message>
+    <message>
+        <source>%1 is starting...</source>
+        <translation>%1 si sta avviando...</translation>
+    </message>
+    <message>
+        <source>%1 will retry in a moment...</source>
+        <translation>%1 riproverà tra un momento...</translation>
+    </message>
+    <message>
+        <source>%1 is stopping...</source>
+        <translation>%1 si sta arrestando...</translation>
+    </message>
+    <message>
+        <source>%1 is waiting for clients</source>
+        <translation>%1 è in attesa di client</translation>
+    </message>
+    <message>
+        <source>%1 is connecting...</source>
+        <translation>%1 è in connessione...</translation>
+    </message>
+    <message>
+        <source>%1 is connected as client of %2</source>
+        <translation>%1 è connesso come client di %2</translation>
+    </message>
+    <message>
+        <source>%1 is disconnected</source>
+        <translation>%1 è disconnesso</translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 is connected, with %n client(s): %2</source>
+        <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>
+        <translation>
+            <numerusform>%1 è connesso con un client %2</numerusform>
+            <numerusform>%1 è connesso con %n client: %2</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Clients:
+ %1</source>
+        <translation>Client:
+ %1</translation>
+    </message>
+    <message>
+        <source>A new version v%1 is available</source>
+        <translation>È disponibile una nuova versione v%1</translation>
+    </message>
+    <message>
+        <source>View local fingerprint</source>
+        <translation>Visualizza impronta digitale locale</translation>
+    </message>
+    <message>
+        <source>Update available</source>
+        <translation>Aggiornamento disponibile</translation>
+    </message>
+    <message>
+        <source>%1 Encryption Enabled</source>
+        <translation>%1 Crittografia abilitata</translation>
+    </message>
+    <message>
+        <source>Encryption Disabled</source>
+        <translation>Crittografia disabilitata</translation>
+    </message>
 </context>
 <context>
     <name>i18n</name>

translations/deskflow_ja.ts

@@ -143,47 +143,47 @@ p, li { white-space: pre-wrap; }
     <name>ClientConfigDialog</name>
     <message>
         <source>Client Configuration</source>
-        <translation type="unfinished">クライアント構成</translation>
+        <translation>クライアント設定</translation>
     </message>
     <message>
         <source>Use server&apos;s keyboard language on this computer</source>
-        <translation type="unfinished">サーバー側のキーボード言語をこのコンピューターで使用する</translation>
+        <translation>サーバー側のキーボード言語をこのコンピューターで使用する</translation>
     </message>
     <message>
         <source>Scroll Modifiers</source>
-        <translation type="unfinished">スクロール修飾子</translation>
+        <translation>スクロール設定</translation>
     </message>
     <message>
         <source>Invert</source>
-        <translation type="unfinished">反転</translation>
+        <translation>反転</translation>
     </message>
     <message>
         <source>Horizontal Scroll</source>
-        <translation type="unfinished">水平スクロール</translation>
+        <translation>水平スクロール</translation>
     </message>
     <message>
         <source>Vertical Scroll</source>
-        <translation type="unfinished">垂直スクロール</translation>
+        <translation>垂直スクロール</translation>
     </message>
     <message>
         <source>Scale</source>
-        <translation type="unfinished">規模</translation>
+        <translation>倍率</translation>
     </message>
     <message>
         <source>Close and save changes</source>
-        <translation type="unfinished">閉じて変更を保存する</translation>
+        <translation>変更を保存して閉じる</translation>
     </message>
     <message>
         <source>Close and forget changes</source>
-        <translation type="unfinished">変更を閉じて忘れる</translation>
+        <translation>変更を破棄して閉じる</translation>
     </message>
     <message>
         <source>Reset to stored values</source>
-        <translation type="unfinished">保存した値にリセット</translation>
+        <translation>変更前の値にリセットする</translation>
     </message>
     <message>
         <source>Reset to default values</source>
-        <translation type="unfinished">デフォルト値にリセット</translation>
+        <translation>デフォルト値にリセットする</translation>
     </message>
 </context>
 <context>
@@ -324,7 +324,7 @@ Do you want to connect to the server?
     </message>
     <message>
         <source>&amp;Configure Server</source>
-        <translation>サーバーを設定(&amp;C)</translation>
+        <translation>サーバー設定(&amp;C)</translation>
     </message>
     <message>
         <source>Export server configuration</source>
@@ -348,11 +348,7 @@ Do you want to connect to the server?
     </message>
     <message>
         <source>invalid certificate, generating a new one</source>
-        <translation type="unfinished">無効な証明書、新しい証明書を生成しています</translation>
+        <translation>無効な証明書、新しい証明書を生成しています</translation>
-    </message>
-    <message>
-        <source>A new version v%1 is available</source>
-        <translation>新しいバージョン(v%1)が利用できます</translation>
     </message>
     <message>
         <source>Address missing</source>
@@ -362,10 +358,6 @@ Do you want to connect to the server?
         <source>Please enter the hostname or IP address of the other computer.</source>
         <translation>他のコンピューターのIPアドレスかホスト名を入力してください。</translation>
     </message>
-    <message>
-        <source>Core cannot be started</source>
-        <translation>コアが起動できません</translation>
-    </message>
     <message>
         <source>Save server configuration as...</source>
         <translation>サーバー設定を保存…</translation>
@@ -395,12 +387,8 @@ Do you want to connect to the server?
         <translation>切断</translation>
     </message>
     <message>
-        <source>%1 Encryption Enabled</source>
+        <source>&lt;p&gt;Failed to connect to the server &apos;%1&apos;.&lt;/p&gt;&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</source>
-        <translation>%1 暗号化有効</translation>
+        <translation>&lt;p&gt;サーバー &apos;%1&apos; への接続に失敗しました。&lt;/p&gt;&lt;p&gt;同じ名前のクライアントがサーバーに接続済です。&lt;/p&gt;&lt;p&gt;名前の重複がないことと、クライアントプロセスが多重起動していない事を確認してください。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Encryption Disabled</source>
-        <translation>暗号化無効</translation>
     </message>
     <message>
         <source>No IP Detected</source>
@@ -412,7 +400,7 @@ Do you want to connect to the server?
     </message>
     <message>
         <source>Using IP: </source>
-        <translation type="unfinished">IPアドレスを使用する： </translation>
+        <translation>使用IPアドレス： </translation>
     </message>
     <message>
         <source>&lt;p&gt;If connecting via the hostname fails, try %1&lt;/p&gt;</source>
@@ -420,7 +408,7 @@ Do you want to connect to the server?
     </message>
     <message>
         <source>the suggested IP.</source>
-        <translation>推奨IPアドレス</translation>
+        <translation>推奨するIPアドレス。</translation>
     </message>
     <message>
         <source>one of the following IPs:&lt;br/&gt;%1</source>
@@ -429,41 +417,9 @@ Do you want to connect to the server?
     <message>
         <source>
 A bound IP is now invalid, you may need to restart the server.</source>
-        <translation type="unfinished">
+        <translation>
 割り当て済みのIPアドレスが無効になりました。サーバーを再起動する必要があるかもしれません。</translation>
     </message>
-    <message>
-        <source>%1 is starting...</source>
-        <translation>%1 は起動処理中です…</translation>
-    </message>
-    <message>
-        <source>%1 will retry in a moment...</source>
-        <translation>%1 はまもなく再試行します…</translation>
-    </message>
-    <message>
-        <source>%1 is stopping...</source>
-        <translation>%1 は停止処理中です…</translation>
-    </message>
-    <message>
-        <source>%1 is not running</source>
-        <translation>%1 は起動していません</translation>
-    </message>
-    <message>
-        <source>%1 is waiting for clients</source>
-        <translation>%1 はクライアント接続を待機中</translation>
-    </message>
-    <message>
-        <source>%1 is connecting...</source>
-        <translation>%1 は接続処理中…</translation>
-    </message>
-    <message>
-        <source>%1 is connected as client of %2</source>
-        <translation>%1 は %2 にクライアントとして接続中</translation>
-    </message>
-    <message>
-        <source>%1 is disconnected</source>
-        <translation>%1 は切断しました</translation>
-    </message>
     <message>
         <source>&amp;File</source>
         <translation>ファイル(&amp;F)</translation>
@@ -533,14 +489,6 @@ A bound IP is now invalid, you may need to restart the server.</source>
         <extracomment>Quit shortcut</extracomment>
         <translation>Ctrl+Q</translation>
     </message>
-    <message>
-        <source>View local fingerprint</source>
-        <translation>自分の指紋を表示</translation>
-    </message>
-    <message>
-        <source>Update available</source>
-        <translation>ソフトウェア更新あり</translation>
-    </message>
     <message>
         <source>Invalid Screen Name</source>
         <translation>不正なコンピューター名</translation>
@@ -563,38 +511,45 @@ Valid names:
 ・_ と -
 ・1から255文字まで</translation>
     </message>
-    <message numerus="yes">
-        <source>%1 is connected, with %n client(s): %2</source>
-        <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>
-        <translation>
-            <numerusform>%1 は%n台のクライアントと接続中: %2</numerusform>
-        </translation>
-    </message>
     <message>
-        <source>Clients:
+        <source>%1 Connection Error</source>
- %1</source>
+        <translation>%1 接続エラー</translation>
-        <translation>クライアント:
- %1</translation>
     </message>
     <message>
         <source>Suggested IP: </source>
-        <translation type="unfinished">推奨IPアドレス: </translation>
+        <translation>推奨IPアドレス: </translation>
-    </message>
-    <message>
-        <source>The Core executable could not be successfully started, although it does exist. Please check if you have sufficient permissions to run this program.</source>
-        <translation>コア実行ファイルは存在していますが、起動できませんでした。このプログラムを実行するのに十分な権限があることを確認してください。</translation>
     </message>
     <message>
         <source>&amp;Configure Client</source>
-        <translation type="unfinished">クライアントの設定 (&amp;C)</translation>
+        <translation>クライアント設定 (&amp;C)</translation>
     </message>
     <message>
         <source>Connect to:</source>
-        <translation type="unfinished">接続先:</translation>
+        <translation>接続先:</translation>
     </message>
     <message>
         <source>&lt;html&gt;Hostname or IP address of the server computer.&lt;br/&gt;May contain a comma seperated list.&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;サーバー コンピューターのホスト名または IP アドレス。&lt;br/&gt;カンマ区切りのリストを含めることができます。&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;サーバーコンピューターのホスト名または IP アドレス。&lt;br/&gt;カンマ区切りのリストを含めることができます。&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished">読み取り</translation>
+    </message>
+    <message>
+        <source>read and write</source>
+        <translation type="unfinished">読み書き</translation>
+    </message>
+    <message>
+        <source>The Core executable could not be started.
+Please check if you have sufficient permissions to run %1.</source>
+        <translation type="unfinished">Coreの実行ファイルを起動できませんでした。
+%1を実行するための十分な権限があるか確認してください。</translation>
+    </message>
+    <message>
+        <source>
+Additionally, check you are able to %1 the server config file: %2</source>
+        <translation type="unfinished">
+また、サーバー設定ファイルを%1できることを確認してください: %2</translation>
     </message>
 </context>
 <context>
@@ -677,30 +632,6 @@ Valid names:
         <source>%1 Connected</source>
         <translation>%1 接続完了</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Failed to connect to the server &apos;%1&apos;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;サーバー &apos;%1&apos; への接続に失敗しました。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;同じ名前のクライアントがサーバーに接続済です。&lt;/p&gt;&lt;p&gt;名前の重複がないことと、クライアントプロセスが多重起動していない事を確認してください。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please try to connect to the server using the server IP address instead of the hostname. &lt;/p&gt;&lt;p&gt;If that doesn&apos;t work, please check your TLS and firewall settings.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;サーバーのホスト名ではなくIPアドレスで接続してみてください。&lt;/p&gt;&lt;p&gt;それでも接続できない場合は、TLSとファイアウォールの設定を確認してください。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please check your TLS and firewall settings.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;TLSとファイアウォールの設定を確認してください。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>%1 Connection Error</source>
-        <translation>%1 接続エラー</translation>
-    </message>
-    <message>
-        <source>Do not show this message again</source>
-        <translation>このメッセージを再表示しない</translation>
-    </message>
     <message>
         <source>%1 - New Client</source>
         <translation>%1 - 新しいクライアント</translation>
@@ -737,10 +668,6 @@ Valid names:
         <source>&lt;p&gt;Settings are read-only because you only have read access to the file:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</source>
         <translation>&lt;p&gt;以下のファイルへの書き込み権限がないため、設定は読み取り専用です:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.&lt;/p&gt;&lt;p&gt;Please either switch to X from your login screen or use a build that uses the correct libraries.&lt;/p&gt;&lt;p&gt;If you think this is incorrect, please &lt;a href=&quot;%2&quot;&gt;report a bug&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Please check the logs for more information.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;申し訳ありません、このバージョンの %1 は Wayland に対応していますが、このビルドには必要なライブラリがリンクされていません。&lt;/p&gt;&lt;p&gt;ログイン画面から X に切り替えるか、正しいライブラリをリンクしたビルドを使用してください。&lt;/p&gt;&lt;p&gt;もしこの説明が正しくないと思われる場合は、&lt;a href=&quot;%2&quot;&gt;バグレポート&lt;/a&gt;してください。&lt;/p&gt;&lt;p&gt;詳細はログを確認してください。&lt;/p&gt;</translation>
-    </message>
     <message>
         <source>No thanks</source>
         <translation>不要です</translation>
@@ -772,21 +699,21 @@ Valid names:
     <message>
         <source>failed to read key from certificate file: %1</source>
         <extracomment>%1 will be replaced by the certificate path</extracomment>
-        <translation type="unfinished">証明書ファイルからキーを読み取ることができませんでした: %1</translation>
+        <translation>証明書ファイルからキーを読み取ることができませんでした: %1</translation>
     </message>
     <message>
         <source>failed to parse certificate file: %1</source>
         <extracomment>%1 will be replaced by the certificate path</extracomment>
-        <translation type="unfinished">証明書ファイルの解析に失敗しました: %1</translation>
+        <translation>証明書ファイルの解析に失敗しました: %1</translation>
     </message>
     <message>
         <source>key detected is the incorrect size</source>
-        <translation type="unfinished">検出されたキーのサイズが正しくありません</translation>
+        <translation>検出されたキーのサイズが正しくありません</translation>
     </message>
     <message>
         <source>failed to read RSA key from certificate file: %1</source>
         <extracomment>%1 will be replaced by the certificate path</extracomment>
-        <translation type="unfinished">証明書ファイルから RSA キーを読み取ることができませんでした: %1</translation>
+        <translation>証明書ファイルから RSA キーを読み取ることができませんでした: %1</translation>
     </message>
     <message>
         <source>%1 is already running</source>
@@ -939,19 +866,19 @@ Valid names:
     <name>SearchWidget</name>
     <message>
         <source>Search</source>
-        <translation type="unfinished">検索</translation>
+        <translation>検索</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished">次を検索</translation>
+        <translation>次を検索</translation>
     </message>
     <message>
         <source>Find previous</source>
-        <translation type="unfinished">前を検索</translation>
+        <translation>前を検索</translation>
     </message>
     <message>
         <source>Find...</source>
-        <translation type="unfinished">検索...</translation>
+        <translation>検索...</translation>
     </message>
 </context>
 <context>
@@ -1152,30 +1079,14 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Preferences</source>
         <translation>設定</translation>
     </message>
-    <message>
-        <source>&amp;Regular</source>
-        <translation>基本(&amp;R)</translation>
-    </message>
-    <message>
-        <source>App</source>
-        <translation>アプリケーション</translation>
-    </message>
     <message>
         <source>Check for updates on startup</source>
         <translation>起動時にソフトウェア更新を確認する</translation>
     </message>
-    <message>
-        <source>Hide the window when the app starts</source>
-        <translation>アプリの起動時にウィンドウを隠す</translation>
-    </message>
     <message>
         <source>Prevent this computer from going to sleep</source>
         <translation>このコンピューターがスリープしないようにする</translation>
     </message>
-    <message>
-        <source>Leave app running in notification area when the window is closed</source>
-        <translation>ウィンドウを閉じてもアプリを通知領域で実行し続ける</translation>
-    </message>
     <message>
         <source>Tray icon style</source>
         <translation>トレイアイコン</translation>
@@ -1212,10 +1123,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>&amp;Advanced</source>
         <translation>詳細(&amp;A)</translation>
     </message>
-    <message>
-        <source>Networking</source>
-        <translation>ネットワーク</translation>
-    </message>
     <message>
         <source>Port</source>
         <translation>ポート</translation>
@@ -1224,10 +1131,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Network IP</source>
         <translation>IPアドレス</translation>
     </message>
-    <message>
-        <source>Logs</source>
-        <translation>ログ</translation>
-    </message>
     <message>
         <source>Level</source>
         <translation>レベル</translation>
@@ -1268,10 +1171,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Log path</source>
         <translation>ログファイルのパス</translation>
     </message>
-    <message>
-        <source>Log to file</source>
-        <translation>ファイルにログを保存する</translation>
-    </message>
     <message>
         <source>Using a Debug log level may affect performance. Only use a Debug level if you are attempting to debug an issue or are gathering logs to submit with a bug report.</source>
         <translation>デバッグレベルのログ取得は性能に影響が出ることがあります。不具合の修正やバグレポートの送信に必要な場合にのみ使用してください。</translation>
@@ -1288,10 +1187,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Always run as system (work at login screen and UAC)</source>
         <translation>常にsystem権限で実行する(ログイン画面とUACで必要)</translation>
     </message>
-    <message>
-        <source>Force a language to be used for the GUI.</source>
-        <translation>GUIの使用言語を設定します。</translation>
-    </message>
     <message>
         <source>Language</source>
         <translation>言語</translation>
@@ -1344,6 +1239,22 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Verbose debug output</source>
         <translation>詳細なデバッグ出力</translation>
     </message>
+    <message>
+        <source>Close and save changes</source>
+        <translation>変更を保存して閉じる</translation>
+    </message>
+    <message>
+        <source>Close and forget changes</source>
+        <translation>変更を破棄して閉じる</translation>
+    </message>
+    <message>
+        <source>Reset to stored values</source>
+        <translation>変更前の値にリセットする</translation>
+    </message>
+    <message>
+        <source>Reset to default values</source>
+        <translation>デフォルト値にリセットする</translation>
+    </message>
     <message>
         <source>Enable wl-clipboard support</source>
         <translation>wl-clipboard によるクリップボード対応を有効にする</translation>
@@ -1354,11 +1265,127 @@ Enabling this setting will disable the server config GUI.</source>
     </message>
     <message>
         <source>Automatic</source>
-        <translation type="unfinished">自動</translation>
+        <translation>自動</translation>
     </message>
     <message>
         <source>Include version in the window title</source>
-        <translation type="unfinished">ウィンドウタイトルにバージョン情報を含める</translation>
+        <translation>ウィンドウタイトルにバージョン情報を含める</translation>
+    </message>
+    <message>
+        <source>Log to file</source>
+        <translation>ファイルにログを保存する</translation>
+    </message>
+    <message>
+        <source>&amp;Logs</source>
+        <translation>ログ(&amp;L)</translation>
+    </message>
+    <message>
+        <source>&amp;General</source>
+        <translation>一般(&amp;G)</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>ネットワーク(&amp;N)</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">ウィンドウ(&amp;W)</translation>
+    </message>
+    <message>
+        <source>When the main window is closed</source>
+        <translation type="unfinished">メインウィンドウが閉じられているとき</translation>
+    </message>
+    <message>
+        <source>Exit</source>
+        <translation type="unfinished">終了</translation>
+    </message>
+    <message>
+        <source>Send to background</source>
+        <translation type="unfinished">バックグラウンドに送信</translation>
+    </message>
+    <message>
+        <source>When the application starts</source>
+        <translation type="unfinished">アプリケーションが起動すると</translation>
+    </message>
+    <message>
+        <source>Show the main window</source>
+        <translation type="unfinished">メインウィンドウを表示する</translation>
+    </message>
+    <message>
+        <source>Run command on enter</source>
+        <translation type="unfinished">Enterキーでコマンドを実行</translation>
+    </message>
+    <message>
+        <source>Run command on exit</source>
+        <translation type="unfinished">終了時にコマンドを実行</translation>
+    </message>
+</context>
+<context>
+    <name>StatusBar</name>
+    <message>
+        <source>%1 is not running</source>
+        <translation>%1 は起動していません</translation>
+    </message>
+    <message>
+        <source>%1 is starting...</source>
+        <translation>%1 は起動処理中です…</translation>
+    </message>
+    <message>
+        <source>%1 will retry in a moment...</source>
+        <translation>%1 はまもなく再試行します…</translation>
+    </message>
+    <message>
+        <source>%1 is stopping...</source>
+        <translation>%1 は停止処理中です…</translation>
+    </message>
+    <message>
+        <source>%1 is waiting for clients</source>
+        <translation>%1 はクライアント接続を待機中</translation>
+    </message>
+    <message>
+        <source>%1 is connecting...</source>
+        <translation>%1 は接続処理中…</translation>
+    </message>
+    <message>
+        <source>%1 is connected as client of %2</source>
+        <translation>%1 は %2 にクライアントとして接続中</translation>
+    </message>
+    <message>
+        <source>%1 is disconnected</source>
+        <translation>%1 は切断しました</translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 is connected, with %n client(s): %2</source>
+        <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>
+        <translation>
+            <numerusform>%1 は%n台のクライアントと接続中: %2</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Clients:
+ %1</source>
+        <translation>クライアント:
+ %1</translation>
+    </message>
+    <message>
+        <source>A new version v%1 is available</source>
+        <translation>新しいバージョン(v%1)が利用できます</translation>
+    </message>
+    <message>
+        <source>View local fingerprint</source>
+        <translation>自分の指紋を表示</translation>
+    </message>
+    <message>
+        <source>Update available</source>
+        <translation>ソフトウェア更新あり</translation>
+    </message>
+    <message>
+        <source>%1 Encryption Enabled</source>
+        <translation>%1 暗号化有効</translation>
+    </message>
+    <message>
+        <source>Encryption Disabled</source>
+        <translation>暗号化無効</translation>
     </message>
 </context>
 <context>

translations/deskflow_ko.ts

@@ -151,11 +151,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Scroll Modifiers</source>
-        <translation type="unfinished">스크롤 수정자</translation>
+        <translation>스크롤 제어자</translation>
     </message>
     <message>
         <source>Invert</source>
-        <translation type="unfinished">거꾸로 하다</translation>
+        <translation>반전</translation>
     </message>
     <message>
         <source>Horizontal Scroll</source>
@@ -171,11 +171,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Close and save changes</source>
-        <translation type="unfinished">닫기 및 변경 사항 저장</translation>
+        <translation>변경 사항 저장 후 닫기</translation>
     </message>
     <message>
         <source>Close and forget changes</source>
-        <translation type="unfinished">설정을 저장하고 나면 변경 사항은 더 이상 신경 쓸 필요가 없습니다</translation>
+        <translation>저장하지 않고 닫기</translation>
     </message>
     <message>
         <source>Reset to stored values</source>
@@ -190,16 +190,16 @@ p, li { white-space: pre-wrap; }
     <name>FingerprintDialog</name>
     <message>
         <source>Local Fingerprints</source>
-        <translation>로컬 지문값</translation>
+        <translation>로컬 핑거프린팅</translation>
     </message>
     <message>
         <source>Local computer&apos;s fingerprint</source>
-        <translation>이 컴퓨터의 지문값</translation>
+        <translation>이 컴퓨터의 핑거프린팅</translation>
     </message>
     <message>
         <source>Compare the fingerprints in this dialog to those on the %1.
 Only connect if they match!</source>
-        <translation>이 대화상자에 표시된 지문값을 %1의 지문값과 비교하세요.
+        <translation>이 대화상자에 표시된 핑거프린팅을 %1의 핑거프린팅과 비교하세요.
 일치할 때만 연결하세요!</translation>
     </message>
     <message>
@@ -236,11 +236,11 @@ Do you want to connect to the server?
     </message>
     <message>
         <source>Server Fingerprint</source>
-        <translation>서버 지문값</translation>
+        <translation>서버 핑거프린팅</translation>
     </message>
     <message>
         <source>Client Fingerprint</source>
-        <translation>클라이언트 지문값</translation>
+        <translation>클라이언트 핑거프린팅</translation>
     </message>
     <message>
         <source>Show image</source>
@@ -252,11 +252,11 @@ Do you want to connect to the server?
     </message>
     <message>
         <source>Display the fingerprint as an image</source>
-        <translation>지문값을 이미지로 표시</translation>
+        <translation>핑거프린팅을 이미지로 표시</translation>
     </message>
     <message>
         <source>Display the fingerprint as a hash</source>
-        <translation>지문값을 해시로 표시</translation>
+        <translation>핑거프린팅을 해시로 표시</translation>
     </message>
 </context>
 <context>
@@ -350,10 +350,6 @@ Do you want to connect to the server?
         <source>invalid certificate, generating a new one</source>
         <translation type="unfinished">유효하지 않은 인증서입니다. 새 인증서를 생성하는 중입니다</translation>
     </message>
-    <message>
-        <source>A new version v%1 is available</source>
-        <translation>새 버전(v%1)을 사용할 수 있습니다</translation>
-    </message>
     <message>
         <source>Address missing</source>
         <translation>주소가 없습니다</translation>
@@ -362,10 +358,6 @@ Do you want to connect to the server?
         <source>Please enter the hostname or IP address of the other computer.</source>
         <translation>다른 컴퓨터의 호스트 이름 또는 IP 주소를 입력하세요.</translation>
     </message>
-    <message>
-        <source>Core cannot be started</source>
-        <translation>코어를 시작할 수 없습니다</translation>
-    </message>
     <message>
         <source>Save server configuration as...</source>
         <translation>서버 설정을 다른 이름으로 저장...</translation>
@@ -395,12 +387,8 @@ Do you want to connect to the server?
         <translation>연결 해제</translation>
     </message>
     <message>
-        <source>%1 Encryption Enabled</source>
+        <source>&lt;p&gt;Failed to connect to the server &apos;%1&apos;.&lt;/p&gt;&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</source>
-        <translation>%1 암호화 사용</translation>
+        <translation>&lt;p&gt;서버 &apos;%1&apos;에 연결하지 못했습니다.&lt;/p&gt;&lt;p&gt;같은 이름의 클라이언트가 이미 서버에 연결되어 있습니다.&lt;/p&gt;&lt;p&gt;고유한 이름을 사용하고, 클라이언트 프로세스가 하나만 실행 중인지 확인하세요.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Encryption Disabled</source>
-        <translation>암호화 사용 안 함</translation>
     </message>
     <message>
         <source>No IP Detected</source>
@@ -429,40 +417,8 @@ Do you want to connect to the server?
     <message>
         <source>
 A bound IP is now invalid, you may need to restart the server.</source>
-        <translation type="unfinished">
+        <translation>
-바인딩된 IP가 이제 유효하지 않습니다. 서버를 재시작해야 할 수 있습니다.</translation>
+연결된 IP가 이제 유효하지 않습니다. 서버를 재시작해야 합니다.</translation>
-    </message>
-    <message>
-        <source>%1 is starting...</source>
-        <translation>%1 시작 중...</translation>
-    </message>
-    <message>
-        <source>%1 will retry in a moment...</source>
-        <translation>%1 잠시 후 재시도합니다...</translation>
-    </message>
-    <message>
-        <source>%1 is stopping...</source>
-        <translation>%1 중지 중...</translation>
-    </message>
-    <message>
-        <source>%1 is not running</source>
-        <translation>%1 실행 중이 아닙니다</translation>
-    </message>
-    <message>
-        <source>%1 is waiting for clients</source>
-        <translation>%1 클라이언트를 기다리는 중</translation>
-    </message>
-    <message>
-        <source>%1 is connecting...</source>
-        <translation>%1 연결 중...</translation>
-    </message>
-    <message>
-        <source>%1 is connected as client of %2</source>
-        <translation>%1이(가) %2의 클라이언트로 연결되었습니다</translation>
-    </message>
-    <message>
-        <source>%1 is disconnected</source>
-        <translation>%1 연결이 해제되었습니다</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -533,14 +489,6 @@ A bound IP is now invalid, you may need to restart the server.</source>
         <extracomment>Quit shortcut</extracomment>
         <translation>Ctrl+Q</translation>
     </message>
-    <message>
-        <source>View local fingerprint</source>
-        <translation>로컬 지문값 보기</translation>
-    </message>
-    <message>
-        <source>Update available</source>
-        <translation>업데이트 사용 가능</translation>
-    </message>
     <message>
         <source>Invalid Screen Name</source>
         <translation>잘못된 컴퓨터 이름</translation>
@@ -563,27 +511,14 @@ Valid names:
 • _ 또는 - 사용 가능
 • 1~255자</translation>
     </message>
-    <message numerus="yes">
-        <source>%1 is connected, with %n client(s): %2</source>
-        <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>
-        <translation>
-            <numerusform>%1이(가) %n대의 클라이언트와 연결됨: %2</numerusform>
-        </translation>
-    </message>
     <message>
-        <source>Clients:
+        <source>%1 Connection Error</source>
- %1</source>
+        <translation>%1 연결 오류</translation>
-        <translation>클라이언트:
- %1</translation>
     </message>
     <message>
         <source>Suggested IP: </source>
         <translation type="unfinished">추천 IP: </translation>
     </message>
-    <message>
-        <source>The Core executable could not be successfully started, although it does exist. Please check if you have sufficient permissions to run this program.</source>
-        <translation>코어 실행 파일은 존재하지만 정상적으로 시작할 수 없습니다. 이 프로그램을 실행할 권한이 충분한지 확인하세요.</translation>
-    </message>
     <message>
         <source>&amp;Configure Client</source>
         <translation type="unfinished">클라이언트 구성 (&amp;C)</translation>
@@ -594,7 +529,27 @@ Valid names:
     </message>
     <message>
         <source>&lt;html&gt;Hostname or IP address of the server computer.&lt;br/&gt;May contain a comma seperated list.&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;서버 컴퓨터의 호스트 이름 또는 IP 주소입니다.&lt;br/&gt;쉼표로 구분된 목록을 포함할 수 있습니다.&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;서버 컴퓨터의 호스트 이름 또는 IP 주소입니다.&lt;br/&gt;목록 요소는 쉼표로 구분됩니다.&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished">읽기</translation>
+    </message>
+    <message>
+        <source>read and write</source>
+        <translation type="unfinished">읽기 및 쓰기</translation>
+    </message>
+    <message>
+        <source>The Core executable could not be started.
+Please check if you have sufficient permissions to run %1.</source>
+        <translation type="unfinished">Core 실행 파일을 시작할 수 없습니다.
+%1을 실행할 수 있는 충분한 권한이 있는지 확인하세요.</translation>
+    </message>
+    <message>
+        <source>
+Additionally, check you are able to %1 the server config file: %2</source>
+        <translation type="unfinished">
+또한 서버 구성 파일을 %1할 수 있는지 확인하세요: %2</translation>
     </message>
 </context>
 <context>
@@ -602,7 +557,7 @@ Valid names:
     <message>
         <source>Unnamed</source>
         <extracomment>Used as the hostname. Translation may not contain spaces</extracomment>
-        <translation>Unnamed</translation>
+        <translation>이름없음</translation>
     </message>
 </context>
 <context>
@@ -618,13 +573,13 @@ Valid names:
     <message>
         <source>&lt;p&gt;Sorry, a fatal error has occurred and the application must now exit.&lt;/p&gt;
 </source>
-        <translation>&lt;p&gt;죄송합니다. 치명적인 오류가 발생하여 애플리케이션을 종료해야 합니다.&lt;/p&gt;
+        <translation>&lt;p&gt;문제가 발생하여 애플리케이션을 종료합니다.&lt;/p&gt;
 </translation>
     </message>
     <message>
         <source>&lt;p&gt;Sorry, a critical error has occurred.&lt;/p&gt;
 </source>
-        <translation>&lt;p&gt;죄송합니다. 심각한 오류가 발생했습니다.&lt;/p&gt;
+        <translation>&lt;p&gt;에러 발생&lt;/p&gt;
 </translation>
     </message>
     <message>
@@ -641,7 +596,7 @@ Valid names:
     </message>
     <message>
         <source>&lt;p&gt;On Linux systems using GNOME 3, the notification area might be disabled. You may need to &lt;a href=&quot;%1&quot;&gt;enable an extension&lt;/a&gt; to see the %2 tray icon.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;GNOME 3을 사용하는 Linux 시스템에서는 알림 영역이 비활성화되어 있을 수 있습니다. %2 트레이 아이콘을 보려면 &lt;a href=&quot;%1&quot;&gt;확장 기능을 활성화&lt;/a&gt;해야 할 수 있습니다.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;GNOME 3을 사용하는 Linux 시스템에서는 알림 영역이 비활성화되어 있을 수 있습니다. %2 트레이 아이콘을 보려면 &lt;a href=&quot;%1&quot;&gt;확장 기능을 활성화&lt;/a&gt;해야 합니다.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>%1 Server</source>
@@ -653,11 +608,11 @@ Valid names:
     </message>
     <message>
         <source>&lt;p&gt;%1 is now connected!&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1이(가) 연결되었습니다!&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;%1이(가) 연결!&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Try moving your mouse to your other computer. Once there, go ahead and type something.&lt;/p&gt;&lt;p&gt;Don&apos;t forget, you can copy and paste between computers too.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;마우스를 다른 컴퓨터로 옮겨 보세요. 이동한 뒤 키보드로 아무 글자나 입력해 보세요.&lt;/p&gt;&lt;p&gt;컴퓨터 간 복사/붙여넣기도 할 수 있습니다.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;마우스를 다른 컴퓨터로 이동시켜 보세요. 이동한 뒤 키보드로 아무 글자나 입력해 보세요.&lt;/p&gt;&lt;p&gt;컴퓨터 간 복사/붙여넣기도 가능합니다.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Try controlling this computer remotely.&lt;/p&gt;</source>
@@ -675,37 +630,13 @@ Valid names:
         <source>%1 Connected</source>
         <translation>%1 연결됨</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Failed to connect to the server &apos;%1&apos;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;서버 &apos;%1&apos;에 연결하지 못했습니다.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;같은 이름의 클라이언트가 이미 서버에 연결되어 있습니다.&lt;/p&gt;&lt;p&gt;고유한 이름을 사용하고, 클라이언트 프로세스가 한 번만 실행 중인지 확인하세요.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please try to connect to the server using the server IP address instead of the hostname. &lt;/p&gt;&lt;p&gt;If that doesn&apos;t work, please check your TLS and firewall settings.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;호스트 이름 대신 서버 IP 주소로 연결해 보세요.&lt;/p&gt;&lt;p&gt;문제가 계속되면 TLS 및 방화벽 설정을 확인하세요.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please check your TLS and firewall settings.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;TLS 및 방화벽 설정을 확인하세요.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>%1 Connection Error</source>
-        <translation>%1 연결 오류</translation>
-    </message>
-    <message>
-        <source>Do not show this message again</source>
-        <translation>다시 표시하지 않기</translation>
-    </message>
     <message>
         <source>%1 - New Client</source>
         <translation>%1 - 새 클라이언트</translation>
     </message>
     <message>
         <source>A new client called &apos;%1&apos; has been accepted. You&apos;ll need to add it to your server&apos;s screen layout.</source>
-        <translation>새 클라이언트 &apos;%1&apos;이(가) 허용되었습니다. 서버의 화면 배치에 추가해야 합니다.</translation>
+        <translation>새 클라이언트 &apos;%1&apos;이(가) 허용되었습니다. 서버의 화면 배치에 추가해 주세요.</translation>
     </message>
     <message>
         <source>Ignore</source>
@@ -725,7 +656,7 @@ Valid names:
     </message>
     <message>
         <source>&lt;p&gt;Are you sure you want to clear all settings and restart %1?&lt;/p&gt;&lt;p&gt;This action cannot be undone.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;모든 설정을 초기화하고 %1을(를) 재시작할까요?&lt;/p&gt;&lt;p&gt;이 작업은 되돌릴 수 없습니다.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;모든 설정을 초기화하고 %1을(를) 재시작할까요?&lt;/p&gt;&lt;p&gt;이 작업은 번복될 수 없습니다.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>%1 Read-only settings</source>
@@ -735,10 +666,6 @@ Valid names:
         <source>&lt;p&gt;Settings are read-only because you only have read access to the file:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</source>
         <translation>&lt;p&gt;다음 파일에 대한 쓰기 권한이 없어 설정이 읽기 전용입니다:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.&lt;/p&gt;&lt;p&gt;Please either switch to X from your login screen or use a build that uses the correct libraries.&lt;/p&gt;&lt;p&gt;If you think this is incorrect, please &lt;a href=&quot;%2&quot;&gt;report a bug&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Please check the logs for more information.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;죄송합니다. 이 버전의 %1은(는) Wayland를 지원하지만, 이 빌드는 필요한 라이브러리 중 하나 이상이 링크되어 있지 않습니다.&lt;/p&gt;&lt;p&gt;로그인 화면에서 X로 전환하거나 올바른 라이브러리를 사용한 빌드를 이용하세요.&lt;/p&gt;&lt;p&gt;이 안내가 올바르지 않다고 생각되면 &lt;a href=&quot;%2&quot;&gt;버그를 신고&lt;/a&gt;해 주세요.&lt;/p&gt;&lt;p&gt;자세한 내용은 로그를 확인하세요.&lt;/p&gt;</translation>
-    </message>
     <message>
         <source>No thanks</source>
         <translation>아니요</translation>
@@ -765,7 +692,7 @@ Valid names:
     </message>
     <message>
         <source>&lt;p&gt;There was a problem finding the %1 background service (daemon).&lt;/p&gt;&lt;p&gt;The background service makes %1 work with UAC prompts and the login screen.&lt;/p&gt;&lt;p&gt;If don&apos;t want to use the background service and intentionally stopped it, you can prevent it&apos;s use by disabling this feature.&lt;/p&gt;&lt;p&gt;If you did not stop the background service intentionally, there may be a problem with it. Please retry or try restarting the %1 service from the Windows services program.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 백그라운드 서비스(데몬)를 찾는 중 문제가 발생했습니다.&lt;/p&gt;&lt;p&gt;백그라운드 서비스는 %1이(가) UAC 프롬프트 및 로그인 화면에서 동작하도록 합니다.&lt;/p&gt;&lt;p&gt;백그라운드 서비스를 사용하지 않으려고 의도적으로 중지한 경우, 이 기능을 비활성화하여 사용을 막을 수 있습니다.&lt;/p&gt;&lt;p&gt;의도적으로 중지한 것이 아니라면 서비스에 문제가 있을 수 있습니다. 재시도하거나 Windows 서비스 관리 프로그램에서 %1 서비스를 재시작해 보세요.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;%1 백그라운드 서비스(daemon)를 찾는 중 문제가 발생했습니다.&lt;/p&gt;&lt;p&gt;백그라운드 서비스는 %1이(가) UAC 프롬프트 및 로그인 화면에서 동작됩니다.&lt;/p&gt;&lt;p&gt;백그라운드 서비스를 사용하지 않으려고 의도적으로 중지한 경우, 이 기능을 비활성화하여 사용을 막을 수 있습니다.&lt;/p&gt;&lt;p&gt;의도적으로 중지한 것이 아니라면 서비스에 문제가 있을 수 있습니다. 재시도하거나 Windows 서비스 관리 프로그램에서 %1 서비스를 재시작해 보세요.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>failed to read key from certificate file: %1</source>
@@ -855,7 +782,7 @@ Valid names:
     </message>
     <message>
         <source>Dead Corners</source>
-        <translation>무효 모서리</translation>
+        <translation>화면 걸림 방지</translation>
     </message>
     <message>
         <source>Top Left</source>
@@ -964,7 +891,7 @@ Valid names:
     </message>
     <message>
         <source>Drag a computer from the grid to the trashcan to remove it.</source>
-        <translation>컴퓨터를 삭제하려면 격자에서 휴지통으로 드래그하세요.</translation>
+        <translation>컴퓨터를 삭제하려면 휴지통으로 드래그하세요.</translation>
     </message>
     <message>
         <source>Configure the layout of your computer displays by dragging to where you want.</source>
@@ -1016,7 +943,7 @@ Valid names:
     </message>
     <message>
         <source>&amp;Dead corners (for this computer)</source>
-        <translation>무효 모서리(&amp;D) (이 컴퓨터)</translation>
+        <translation>화면 걸림 방지(&amp;D) (이 컴퓨터)</translation>
     </message>
     <message>
         <source>&amp;Bottom-left</source>
@@ -1118,7 +1045,7 @@ Valid names:
         <source>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.
 
 Enabling this setting will disable the server config GUI.</source>
-        <translation>단순한 격자 기반 레이아웃 편집기로는 만들 수 없는 복잡한 컴퓨터 배치를 구성하려면 서버 설정 파일을 사용하세요.
+        <translation>격자 기반 레이아웃 편집기로는 만들 수 없는 복잡한 컴퓨터 배치를 구성하려면 서버 설정 파일을 사용하세요.
 
 이 설정을 활성화하면 서버 설정 GUI가 비활성화됩니다.</translation>
     </message>
@@ -1150,30 +1077,14 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Preferences</source>
         <translation>환경설정</translation>
     </message>
-    <message>
-        <source>&amp;Regular</source>
-        <translation>일반(&amp;R)</translation>
-    </message>
-    <message>
-        <source>App</source>
-        <translation>앱</translation>
-    </message>
     <message>
         <source>Check for updates on startup</source>
         <translation>시작 시 업데이트 확인</translation>
     </message>
-    <message>
-        <source>Hide the window when the app starts</source>
-        <translation>앱 시작 시 창 숨기기</translation>
-    </message>
     <message>
         <source>Prevent this computer from going to sleep</source>
         <translation>이 컴퓨터를 절전 모드로 전환하지 않음</translation>
     </message>
-    <message>
-        <source>Leave app running in notification area when the window is closed</source>
-        <translation>창을 닫아도 알림 영역에서 앱을 계속 실행</translation>
-    </message>
     <message>
         <source>Tray icon style</source>
         <translation>트레이 아이콘 스타일</translation>
@@ -1210,10 +1121,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>&amp;Advanced</source>
         <translation>고급(&amp;A)</translation>
     </message>
-    <message>
-        <source>Networking</source>
-        <translation>네트워크</translation>
-    </message>
     <message>
         <source>Port</source>
         <translation>포트</translation>
@@ -1222,10 +1129,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Network IP</source>
         <translation>네트워크 IP</translation>
     </message>
-    <message>
-        <source>Logs</source>
-        <translation>로그</translation>
-    </message>
     <message>
         <source>Level</source>
         <translation>레벨</translation>
@@ -1266,10 +1169,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Log path</source>
         <translation>로그 경로</translation>
     </message>
-    <message>
-        <source>Log to file</source>
-        <translation>파일로 로그 저장</translation>
-    </message>
     <message>
         <source>Using a Debug log level may affect performance. Only use a Debug level if you are attempting to debug an issue or are gathering logs to submit with a bug report.</source>
         <translation>디버그 로그 레벨은 성능에 영향을 줄 수 있습니다. 문제를 디버깅하거나 버그 신고에 첨부할 로그를 수집할 때만 디버그 레벨을 사용하세요.</translation>
@@ -1280,16 +1179,12 @@ Enabling this setting will disable the server config GUI.</source>
     </message>
     <message>
         <source>Use background service (daemon)</source>
-        <translation>백그라운드 서비스(데몬) 사용</translation>
+        <translation>백그라운드 서비스(daemon) 사용</translation>
     </message>
     <message>
         <source>Always run as system (work at login screen and UAC)</source>
         <translation>항상 시스템 권한으로 실행(로그인 화면 및 UAC에서 동작)</translation>
     </message>
-    <message>
-        <source>Force a language to be used for the GUI.</source>
-        <translation>GUI에서 사용할 언어를 강제로 지정합니다.</translation>
-    </message>
     <message>
         <source>Language</source>
         <translation>언어</translation>
@@ -1342,13 +1237,29 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Verbose debug output</source>
         <translation>상세 디버그 출력</translation>
     </message>
+    <message>
+        <source>Close and save changes</source>
+        <translation>변경 사항 저장 후 닫기</translation>
+    </message>
+    <message>
+        <source>Close and forget changes</source>
+        <translation>저장하지 않고 닫기</translation>
+    </message>
+    <message>
+        <source>Reset to stored values</source>
+        <translation type="unfinished">저장된 값으로 재설정</translation>
+    </message>
+    <message>
+        <source>Reset to default values</source>
+        <translation type="unfinished">기본값으로 재설정</translation>
+    </message>
     <message>
         <source>Enable wl-clipboard support</source>
         <translation>wl-clipboard 지원 사용</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Requires the wl-clipboard package&lt;/p&gt;&lt;p&gt;When using wl-clipboard v2.2.1, there is a focus stealing bug that may make Deskflow harder to use. This has been fixed when using the wl-clipboard master branch, unless your Compositor lacks wlroots-data-control protocol support.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;wl-clipboard 패키지가 필요합니다.&lt;/p&gt;&lt;p&gt;wl-clipboard v2.2.1 사용 시 포커스 탈취 버그로 인해 Deskflow 사용이 어려워질 수 있습니다. 이 문제는 wl-clipboard master 브랜치를 사용하면 해결되지만, 사용 중인 컴포지터가 wlroots-data-control 프로토콜을 지원하지 않으면 해결되지 않을 수 있습니다.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;wl-clipboard 패키지가 필요합니다.&lt;/p&gt;&lt;p&gt;wl-clipboard v2.2.1 사용 시 포커스 탈취 버그로 인해 Deskflow 사용이 어려워질 수 있습니다. 이 문제는 wl-clipboard master 브랜치를 사용하면 해결되지만, 사용 중인 컴포지터가 wlroots-data-control 프로토콜을 지원하지 않으면 해결이 안 될 수 있습니다.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Automatic</source>
@@ -1358,6 +1269,122 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Include version in the window title</source>
         <translation type="unfinished">창 제목에 버전 정보 포함</translation>
     </message>
+    <message>
+        <source>Log to file</source>
+        <translation>파일로 로그 저장</translation>
+    </message>
+    <message>
+        <source>&amp;Logs</source>
+        <translation>로그 (&amp;L)</translation>
+    </message>
+    <message>
+        <source>&amp;General</source>
+        <translation>일반(&amp;G)</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>네트워크(&amp;N)</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">창문(&amp;W)</translation>
+    </message>
+    <message>
+        <source>When the main window is closed</source>
+        <translation type="unfinished">메인 창이 닫혔을 때</translation>
+    </message>
+    <message>
+        <source>Exit</source>
+        <translation type="unfinished">출구</translation>
+    </message>
+    <message>
+        <source>Send to background</source>
+        <translation type="unfinished">백그라운드로 보내기</translation>
+    </message>
+    <message>
+        <source>When the application starts</source>
+        <translation type="unfinished">애플리케이션이 시작될 때</translation>
+    </message>
+    <message>
+        <source>Show the main window</source>
+        <translation type="unfinished">메인 창을 표시합니다</translation>
+    </message>
+    <message>
+        <source>Run command on enter</source>
+        <translation type="unfinished">Enter 키를 누르면 명령 실행</translation>
+    </message>
+    <message>
+        <source>Run command on exit</source>
+        <translation type="unfinished">종료 시 명령 실행</translation>
+    </message>
+</context>
+<context>
+    <name>StatusBar</name>
+    <message>
+        <source>%1 is not running</source>
+        <translation>%1 실행 중이 아닙니다</translation>
+    </message>
+    <message>
+        <source>%1 is starting...</source>
+        <translation>%1 시작 중...</translation>
+    </message>
+    <message>
+        <source>%1 will retry in a moment...</source>
+        <translation>%1 잠시 후 재시도합니다...</translation>
+    </message>
+    <message>
+        <source>%1 is stopping...</source>
+        <translation>%1 중지 중...</translation>
+    </message>
+    <message>
+        <source>%1 is waiting for clients</source>
+        <translation>%1 클라이언트를 기다리는 중</translation>
+    </message>
+    <message>
+        <source>%1 is connecting...</source>
+        <translation>%1 연결 중...</translation>
+    </message>
+    <message>
+        <source>%1 is connected as client of %2</source>
+        <translation>%1이(가) %2의 클라이언트로 연결되었습니다</translation>
+    </message>
+    <message>
+        <source>%1 is disconnected</source>
+        <translation>%1 연결이 해제되었습니다</translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 is connected, with %n client(s): %2</source>
+        <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>
+        <translation>
+            <numerusform>%1이(가) %n대의 클라이언트와 연결됨: %2</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Clients:
+ %1</source>
+        <translation>클라이언트:
+ %1</translation>
+    </message>
+    <message>
+        <source>A new version v%1 is available</source>
+        <translation>새 버전(v%1)을 사용할 수 있습니다</translation>
+    </message>
+    <message>
+        <source>View local fingerprint</source>
+        <translation>로컬 핑거프린팅 보기</translation>
+    </message>
+    <message>
+        <source>Update available</source>
+        <translation>업데이트 사용 가능</translation>
+    </message>
+    <message>
+        <source>%1 Encryption Enabled</source>
+        <translation>%1 암호화 사용</translation>
+    </message>
+    <message>
+        <source>Encryption Disabled</source>
+        <translation>암호화 사용 안 함</translation>
+    </message>
 </context>
 <context>
     <name>i18n</name>
@@ -1398,7 +1425,7 @@ Enabling this setting will disable the server config GUI.</source>
     </message>
     <message>
         <source>A computer with this name already exists</source>
-        <translation>이 이름의 컴퓨터가 이미 존재합니다</translation>
+        <translation>동명의 컴퓨터가 이미 존재합니다</translation>
     </message>
 </context>
 </TS>

translations/deskflow_ru.ts

@@ -350,10 +350,6 @@ Do you want to connect to the server?
         <source>invalid certificate, generating a new one</source>
         <translation>недействительный сертификат, создание нового</translation>
     </message>
-    <message>
-        <source>A new version v%1 is available</source>
-        <translation>Доступна новая версия v%1</translation>
-    </message>
     <message>
         <source>Address missing</source>
         <translation>Адрес не указан</translation>
@@ -362,10 +358,6 @@ Do you want to connect to the server?
         <source>Please enter the hostname or IP address of the other computer.</source>
         <translation>Пожалуйста, введите имя хоста или IP-адрес другого компьютера.</translation>
     </message>
-    <message>
-        <source>Core cannot be started</source>
-        <translation>Не удалось запустить ядро</translation>
-    </message>
     <message>
         <source>Save server configuration as...</source>
         <translation>Сохранить конфигурацию сервера как...</translation>
@@ -395,12 +387,8 @@ Do you want to connect to the server?
         <translation>Отключиться</translation>
     </message>
     <message>
-        <source>%1 Encryption Enabled</source>
+        <source>&lt;p&gt;Failed to connect to the server &apos;%1&apos;.&lt;/p&gt;&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</source>
-        <translation>Шифрование %1 включено</translation>
+        <translation>&lt;p&gt;Не удалось подключиться к серверу &apos;%1&apos;.&lt;/p&gt;&lt;p&gt;Клиент с таким именем уже подключен к серверу.&lt;/p&gt;Убедитесь, что вы используете уникальное имя и запущен только один процесс клиента.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Encryption Disabled</source>
-        <translation>Шифрование отключено</translation>
     </message>
     <message>
         <source>No IP Detected</source>
@@ -432,38 +420,6 @@ A bound IP is now invalid, you may need to restart the server.</source>
         <translation>
 Привязанный IP-адрес стал недействительным. Возможно требуется перезапуск сервера.</translation>
     </message>
-    <message>
-        <source>%1 is starting...</source>
-        <translation>%1 запускается...</translation>
-    </message>
-    <message>
-        <source>%1 will retry in a moment...</source>
-        <translation>%1 скоро повторит попытку...</translation>
-    </message>
-    <message>
-        <source>%1 is stopping...</source>
-        <translation>%1 останавливается...</translation>
-    </message>
-    <message>
-        <source>%1 is not running</source>
-        <translation>%1 не запущен</translation>
-    </message>
-    <message>
-        <source>%1 is waiting for clients</source>
-        <translation>%1 ожидает подключения клиентов</translation>
-    </message>
-    <message>
-        <source>%1 is connecting...</source>
-        <translation>%1 подключается...</translation>
-    </message>
-    <message>
-        <source>%1 is connected as client of %2</source>
-        <translation>%1 подключен как клиент к %2</translation>
-    </message>
-    <message>
-        <source>%1 is disconnected</source>
-        <translation>%1 отключен</translation>
-    </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
@@ -533,14 +489,6 @@ A bound IP is now invalid, you may need to restart the server.</source>
         <extracomment>Quit shortcut</extracomment>
         <translation>Ctrl+Q</translation>
     </message>
-    <message>
-        <source>View local fingerprint</source>
-        <translation>Показать локальный отпечаток</translation>
-    </message>
-    <message>
-        <source>Update available</source>
-        <translation>Доступно обновление</translation>
-    </message>
     <message>
         <source>Invalid Screen Name</source>
         <translation>Недопустимое имя экрана</translation>
@@ -563,29 +511,14 @@ Valid names:
 • Можно использовать _ или -
 • Длина от 1 до 255 символов</translation>
     </message>
-    <message numerus="yes">
-        <source>%1 is connected, with %n client(s): %2</source>
-        <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>
-        <translation>
-            <numerusform>%1 подключен к %n клиенту: %2</numerusform>
-            <numerusform>%1 подключен к %n клиентам: %2</numerusform>
-            <numerusform>%1 подключен к %n клиентам: %2</numerusform>
-        </translation>
-    </message>
     <message>
-        <source>Clients:
+        <source>%1 Connection Error</source>
- %1</source>
+        <translation>Ошибка соединения %1</translation>
-        <translation>Клиенты:
- %1</translation>
     </message>
     <message>
         <source>Suggested IP: </source>
         <translation>Рекомендуемый IP-адрес: </translation>
     </message>
-    <message>
-        <source>The Core executable could not be successfully started, although it does exist. Please check if you have sufficient permissions to run this program.</source>
-        <translation>Не удалось запустить исполняемый файл ядра, хотя он существует. Проверьте наличие прав на запуск программы.</translation>
-    </message>
     <message>
         <source>&amp;Configure Client</source>
         <translation type="unfinished">&amp;Настройка клиента</translation>
@@ -598,6 +531,26 @@ Valid names:
         <source>&lt;html&gt;Hostname or IP address of the server computer.&lt;br/&gt;May contain a comma seperated list.&lt;/html&gt;</source>
         <translation type="unfinished">&lt;html&gt;Имя хоста или IP-адрес серверного компьютера.&lt;br/&gt;Может содержать список, разделенный запятыми.&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished">прочитать</translation>
+    </message>
+    <message>
+        <source>read and write</source>
+        <translation type="unfinished">читать и записывать</translation>
+    </message>
+    <message>
+        <source>The Core executable could not be started.
+Please check if you have sufficient permissions to run %1.</source>
+        <translation type="unfinished">Не удалось запустить исполняемый файл Core.
+Проверьте, достаточно ли у вас прав для запуска %1.</translation>
+    </message>
+    <message>
+        <source>
+Additionally, check you are able to %1 the server config file: %2</source>
+        <translation type="unfinished">
+Также убедитесь, что вы можете %1 файл конфигурации сервера: %2</translation>
+    </message>
 </context>
 <context>
     <name>NewScreenWidget</name>
@@ -677,30 +630,6 @@ Valid names:
         <source>%1 Connected</source>
         <translation>%1 подключено</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Failed to connect to the server &apos;%1&apos;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Не удалось подключиться к серверу &apos;%1&apos;.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Клиент с таким именем уже подключен к серверу.&lt;/p&gt;Убедитесь, что вы используете уникальное имя и запущен только один процесс клиента.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please try to connect to the server using the server IP address instead of the hostname. &lt;/p&gt;&lt;p&gt;If that doesn&apos;t work, please check your TLS and firewall settings.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Попробуйте подключиться к серверу по IP-адресу вместо имени хоста. &lt;/p&gt;&lt;p&gt;Если это не поможет, проверьте настройки TLS и брандмауэра.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please check your TLS and firewall settings.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Пожалуйста, проверьте настройки TLS и брандмауэра.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>%1 Connection Error</source>
-        <translation>Ошибка соединения %1</translation>
-    </message>
-    <message>
-        <source>Do not show this message again</source>
-        <translation>Больше не показывать это сообщение</translation>
-    </message>
     <message>
         <source>%1 - New Client</source>
         <translation>%1 - Новый клиент</translation>
@@ -737,10 +666,6 @@ Valid names:
         <source>&lt;p&gt;Settings are read-only because you only have read access to the file:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</source>
         <translation>&lt;p&gt;Настройки доступны только для чтения, так как у вас есть доступ только на чтение к файлу:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.&lt;/p&gt;&lt;p&gt;Please either switch to X from your login screen or use a build that uses the correct libraries.&lt;/p&gt;&lt;p&gt;If you think this is incorrect, please &lt;a href=&quot;%2&quot;&gt;report a bug&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Please check the logs for more information.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Хотя эта версия %1 поддерживает Wayland, данная сборка не была слинкована с необходимыми библиотеками.&lt;/p&gt;&lt;p&gt;Пожалуйста, переключитесь на сессию X11 или используйте сборку с поддержкой нужных библиотек.&lt;/p&gt;&lt;p&gt;Если вы считаете это ошибкой, пожалуйста, &lt;a href=&quot;%2&quot;&gt;сообщите о ней&lt;/a&gt;.&lt;/p&gt;</translation>
-    </message>
     <message>
         <source>No thanks</source>
         <translation>Нет, спасибо</translation>
@@ -1150,30 +1075,14 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
-    <message>
-        <source>&amp;Regular</source>
-        <translation>&amp;Основные</translation>
-    </message>
-    <message>
-        <source>App</source>
-        <translation>Приложение</translation>
-    </message>
     <message>
         <source>Check for updates on startup</source>
         <translation>Проверять обновления при запуске</translation>
     </message>
-    <message>
-        <source>Hide the window when the app starts</source>
-        <translation>Скрывать окно при запуске</translation>
-    </message>
     <message>
         <source>Prevent this computer from going to sleep</source>
         <translation>Запретить компьютеру переходить в спящий режим</translation>
     </message>
-    <message>
-        <source>Leave app running in notification area when the window is closed</source>
-        <translation>Оставлять приложение в области уведомлений при закрытии окна</translation>
-    </message>
     <message>
         <source>Tray icon style</source>
         <translation>Стиль иконки трея</translation>
@@ -1210,10 +1119,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>&amp;Advanced</source>
         <translation>&amp;Расширенные</translation>
     </message>
-    <message>
-        <source>Networking</source>
-        <translation>Сеть</translation>
-    </message>
     <message>
         <source>Port</source>
         <translation>Порт</translation>
@@ -1222,10 +1127,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Network IP</source>
         <translation>Сетевой IP-адрес</translation>
     </message>
-    <message>
-        <source>Logs</source>
-        <translation>Журналы</translation>
-    </message>
     <message>
         <source>Level</source>
         <translation>Уровень</translation>
@@ -1266,10 +1167,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Log path</source>
         <translation>Путь к журналам</translation>
     </message>
-    <message>
-        <source>Log to file</source>
-        <translation>Записывать в файл</translation>
-    </message>
     <message>
         <source>Using a Debug log level may affect performance. Only use a Debug level if you are attempting to debug an issue or are gathering logs to submit with a bug report.</source>
         <translation>Уровень отладки может повлиять на производительность. Используйте его только для поиска неисправностей.</translation>
@@ -1286,10 +1183,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Always run as system (work at login screen and UAC)</source>
         <translation>Всегда запускать от имени системы (работает на экране входа и UAC)</translation>
     </message>
-    <message>
-        <source>Force a language to be used for the GUI.</source>
-        <translation>Принудительно использовать язык для интерфейса.</translation>
-    </message>
     <message>
         <source>Language</source>
         <translation>Язык</translation>
@@ -1346,6 +1239,22 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Verbose debug output</source>
         <translation>Подробный вывод отладки</translation>
     </message>
+    <message>
+        <source>Close and save changes</source>
+        <translation type="unfinished">Закрыть и сохранить изменения</translation>
+    </message>
+    <message>
+        <source>Close and forget changes</source>
+        <translation type="unfinished">Закройте изменения и забудьте о них</translation>
+    </message>
+    <message>
+        <source>Reset to stored values</source>
+        <translation type="unfinished">Сбросить до сохраненных значений</translation>
+    </message>
+    <message>
+        <source>Reset to default values</source>
+        <translation type="unfinished">Сбросить до значений по умолчанию</translation>
+    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Requires the wl-clipboard package&lt;/p&gt;&lt;p&gt;When using wl-clipboard v2.2.1, there is a focus stealing bug that may make Deskflow harder to use. This has been fixed when using the wl-clipboard master branch, unless your Compositor lacks wlroots-data-control protocol support.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Требуется пакет wl-clipboard. В версии 2.2.1 есть ошибка перехвата фокуса.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -1358,6 +1267,124 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Include version in the window title</source>
         <translation type="unfinished">Включить номер версии в заголовок окна</translation>
     </message>
+    <message>
+        <source>Log to file</source>
+        <translation>Записывать в файл</translation>
+    </message>
+    <message>
+        <source>&amp;Logs</source>
+        <translation>&amp;Журнал</translation>
+    </message>
+    <message>
+        <source>&amp;General</source>
+        <translation type="unfinished">&amp;Общий</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>&amp;Сеть</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Окно</translation>
+    </message>
+    <message>
+        <source>When the main window is closed</source>
+        <translation type="unfinished">Когда главное окно закрыто</translation>
+    </message>
+    <message>
+        <source>Exit</source>
+        <translation type="unfinished">Выход</translation>
+    </message>
+    <message>
+        <source>Send to background</source>
+        <translation type="unfinished">Отправить в фоновый режим</translation>
+    </message>
+    <message>
+        <source>When the application starts</source>
+        <translation type="unfinished">Когда приложение запускается</translation>
+    </message>
+    <message>
+        <source>Show the main window</source>
+        <translation type="unfinished">Показать главное окно</translation>
+    </message>
+    <message>
+        <source>Run command on enter</source>
+        <translation type="unfinished">Выполнять команду по нажатию Enter</translation>
+    </message>
+    <message>
+        <source>Run command on exit</source>
+        <translation type="unfinished">Выполнить команду при выходе</translation>
+    </message>
+</context>
+<context>
+    <name>StatusBar</name>
+    <message>
+        <source>%1 is not running</source>
+        <translation>%1 не запущен</translation>
+    </message>
+    <message>
+        <source>%1 is starting...</source>
+        <translation>%1 запускается...</translation>
+    </message>
+    <message>
+        <source>%1 will retry in a moment...</source>
+        <translation>%1 скоро повторит попытку...</translation>
+    </message>
+    <message>
+        <source>%1 is stopping...</source>
+        <translation>%1 останавливается...</translation>
+    </message>
+    <message>
+        <source>%1 is waiting for clients</source>
+        <translation>%1 ожидает подключения клиентов</translation>
+    </message>
+    <message>
+        <source>%1 is connecting...</source>
+        <translation>%1 подключается...</translation>
+    </message>
+    <message>
+        <source>%1 is connected as client of %2</source>
+        <translation>%1 подключен как клиент к %2</translation>
+    </message>
+    <message>
+        <source>%1 is disconnected</source>
+        <translation>%1 отключен</translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 is connected, with %n client(s): %2</source>
+        <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>
+        <translation>
+            <numerusform>%1 подключен к %n клиенту: %2</numerusform>
+            <numerusform>%1 подключен к %n клиентам: %2</numerusform>
+            <numerusform>%1 подключен к %n клиентам: %2</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Clients:
+ %1</source>
+        <translation>Клиенты:
+ %1</translation>
+    </message>
+    <message>
+        <source>A new version v%1 is available</source>
+        <translation>Доступна новая версия v%1</translation>
+    </message>
+    <message>
+        <source>View local fingerprint</source>
+        <translation>Показать локальный отпечаток</translation>
+    </message>
+    <message>
+        <source>Update available</source>
+        <translation>Доступно обновление</translation>
+    </message>
+    <message>
+        <source>%1 Encryption Enabled</source>
+        <translation>Шифрование %1 включено</translation>
+    </message>
+    <message>
+        <source>Encryption Disabled</source>
+        <translation>Шифрование отключено</translation>
+    </message>
 </context>
 <context>
     <name>i18n</name>

translations/deskflow_zh_CN.ts

@@ -175,7 +175,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Close and forget changes</source>
-        <translation type="unfinished">关闭并忘记更改</translation>
+        <translation>关闭并放弃修改</translation>
     </message>
     <message>
         <source>Reset to stored values</source>
@@ -350,10 +350,6 @@ Do you want to connect to the server?
         <source>invalid certificate, generating a new one</source>
         <translation type="unfinished">证书无效，正在生成新证书</translation>
     </message>
-    <message>
-        <source>A new version v%1 is available</source>
-        <translation>新版本 v%1 可用</translation>
-    </message>
     <message>
         <source>Address missing</source>
         <translation>缺少地址</translation>
@@ -362,10 +358,6 @@ Do you want to connect to the server?
         <source>Please enter the hostname or IP address of the other computer.</source>
         <translation>请输入另一台计算机的主机名或 IP 地址。</translation>
     </message>
-    <message>
-        <source>Core cannot be started</source>
-        <translation>核心服务无法启动</translation>
-    </message>
     <message>
         <source>Save server configuration as...</source>
         <translation>另存服务器配置为...</translation>
@@ -395,12 +387,8 @@ Do you want to connect to the server?
         <translation>断开</translation>
     </message>
     <message>
-        <source>%1 Encryption Enabled</source>
+        <source>&lt;p&gt;Failed to connect to the server &apos;%1&apos;.&lt;/p&gt;&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</source>
-        <translation>%1 加密已启用</translation>
+        <translation>&lt;p&gt;连接到服务器“%1”失败。&lt;/p&gt;&lt;p&gt;一个同名的客户端已连接到服务器。&lt;/p&gt;请确保您使用的名称唯一，且只有一个客户端进程实例在运行。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Encryption Disabled</source>
-        <translation>加密已禁用</translation>
     </message>
     <message>
         <source>No IP Detected</source>
@@ -432,38 +420,6 @@ A bound IP is now invalid, you may need to restart the server.</source>
         <translation type="unfinished">
 绑定的IP地址现在无效，您可能需要重启服务器。</translation>
     </message>
-    <message>
-        <source>%1 is starting...</source>
-        <translation>%1 正在启动...</translation>
-    </message>
-    <message>
-        <source>%1 will retry in a moment...</source>
-        <translation>%1 将稍后重试...</translation>
-    </message>
-    <message>
-        <source>%1 is stopping...</source>
-        <translation>%1 正在停止...</translation>
-    </message>
-    <message>
-        <source>%1 is not running</source>
-        <translation>%1 未在运行</translation>
-    </message>
-    <message>
-        <source>%1 is waiting for clients</source>
-        <translation>%1 正在等待客户端连接</translation>
-    </message>
-    <message>
-        <source>%1 is connecting...</source>
-        <translation>%1 正在连接...</translation>
-    </message>
-    <message>
-        <source>%1 is connected as client of %2</source>
-        <translation>%1 已作为 %2 的客户端连接</translation>
-    </message>
-    <message>
-        <source>%1 is disconnected</source>
-        <translation>%1 已断开连接</translation>
-    </message>
     <message>
         <source>&amp;File</source>
         <translation>文件(&amp;F)</translation>
@@ -533,14 +489,6 @@ A bound IP is now invalid, you may need to restart the server.</source>
         <extracomment>Quit shortcut</extracomment>
         <translation>Ctrl+Q</translation>
     </message>
-    <message>
-        <source>View local fingerprint</source>
-        <translation>查看本地指纹</translation>
-    </message>
-    <message>
-        <source>Update available</source>
-        <translation>有可用更新</translation>
-    </message>
     <message>
         <source>Invalid Screen Name</source>
         <translation>无效的屏幕名称</translation>
@@ -563,27 +511,14 @@ Valid names:
 • 可以使用 _ 或 -
 • 长度在 1 到 255 个字符之间</translation>
     </message>
-    <message numerus="yes">
-        <source>%1 is connected, with %n client(s): %2</source>
-        <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>
-        <translation>
-            <numerusform>%1 已连接，共有 %n 个客户端：%2</numerusform>
-        </translation>
-    </message>
     <message>
-        <source>Clients:
+        <source>%1 Connection Error</source>
- %1</source>
+        <translation>%1 连接错误</translation>
-        <translation>客户端：
- %1</translation>
     </message>
     <message>
         <source>Suggested IP: </source>
         <translation type="unfinished">建议 IP： </translation>
     </message>
-    <message>
-        <source>The Core executable could not be successfully started, although it does exist. Please check if you have sufficient permissions to run this program.</source>
-        <translation type="unfinished">Core 可执行文件虽然存在，但无法成功启动。请检查您是否拥有运行此程序的足够权限。</translation>
-    </message>
     <message>
         <source>&amp;Configure Client</source>
         <translation type="unfinished">配置客户端(&amp;C)</translation>
@@ -596,6 +531,26 @@ Valid names:
         <source>&lt;html&gt;Hostname or IP address of the server computer.&lt;br/&gt;May contain a comma seperated list.&lt;/html&gt;</source>
         <translation type="unfinished">&lt;html&gt;服务器计算机的主机名或 IP 地址。&lt;br/&gt;可以包含以逗号分隔的列表。&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished">读取</translation>
+    </message>
+    <message>
+        <source>read and write</source>
+        <translation type="unfinished">读取和写入</translation>
+    </message>
+    <message>
+        <source>The Core executable could not be started.
+Please check if you have sufficient permissions to run %1.</source>
+        <translation type="unfinished">无法启动Core可执行文件。
+请检查您是否有足够的权限来运行%1。</translation>
+    </message>
+    <message>
+        <source>
+Additionally, check you are able to %1 the server config file: %2</source>
+        <translation type="unfinished">
+另外，请检查您是否能够%1服务器配置文件：%2</translation>
+    </message>
 </context>
 <context>
     <name>NewScreenWidget</name>
@@ -677,30 +632,6 @@ Valid names:
         <source>%1 Connected</source>
         <translation>%1 已连接</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Failed to connect to the server &apos;%1&apos;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;连接到服务器“%1”失败。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;A Client with your name is already connected to the server.&lt;/p&gt;Please ensure that you&apos;re using a unique name and that only a single instance of the client process is running.&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;一个同名的客户端已连接到服务器。&lt;/p&gt;请确保您使用的名称唯一，且只有一个客户端进程实例在运行。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please try to connect to the server using the server IP address instead of the hostname. &lt;/p&gt;&lt;p&gt;If that doesn&apos;t work, please check your TLS and firewall settings.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;请尝试使用服务器 IP 地址而不是主机名来连接服务器。&lt;/p&gt;&lt;p&gt;如果不起作用，请检查您的 TLS 和防火墙设置。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please check your TLS and firewall settings.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;请检查您的 TLS 和防火墙设置。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>%1 Connection Error</source>
-        <translation>%1 连接错误</translation>
-    </message>
-    <message>
-        <source>Do not show this message again</source>
-        <translation>不再显示此消息</translation>
-    </message>
     <message>
         <source>%1 - New Client</source>
         <translation>%1 - 新客户端</translation>
@@ -737,10 +668,6 @@ Valid names:
         <source>&lt;p&gt;Settings are read-only because you only have read access to the file:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</source>
         <translation>&lt;p&gt;设置是只读的，因为您对该文件只有读取权限：&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.&lt;/p&gt;&lt;p&gt;Please either switch to X from your login screen or use a build that uses the correct libraries.&lt;/p&gt;&lt;p&gt;If you think this is incorrect, please &lt;a href=&quot;%2&quot;&gt;report a bug&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Please check the logs for more information.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;抱歉，虽然此版本的 %1 支持 Wayland，但此构建版本未链接一个或多个所需的库。&lt;/p&gt;&lt;p&gt;请从登录屏幕切换到 X，或者使用链接了正确库的构建版本。&lt;/p&gt;&lt;p&gt;如果您认为存在问题，请 &lt;a href=&quot;%2&quot;&gt;报告 Bug&lt;/a&gt;。&lt;/p&gt;&lt;p&gt;请查看日志以获取更多信息。&lt;/p&gt;</translation>
-    </message>
     <message>
         <source>No thanks</source>
         <translation>不，谢谢</translation>
@@ -1152,30 +1079,14 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Preferences</source>
         <translation>首选项</translation>
     </message>
-    <message>
-        <source>&amp;Regular</source>
-        <translation>常规(&amp;R)</translation>
-    </message>
-    <message>
-        <source>App</source>
-        <translation>应用程序</translation>
-    </message>
     <message>
         <source>Check for updates on startup</source>
         <translation>启动时检查更新</translation>
     </message>
-    <message>
-        <source>Hide the window when the app starts</source>
-        <translation>应用启动时隐藏窗口</translation>
-    </message>
     <message>
         <source>Prevent this computer from going to sleep</source>
         <translation>防止此计算机进入睡眠状态</translation>
     </message>
-    <message>
-        <source>Leave app running in notification area when the window is closed</source>
-        <translation>窗口关闭时让应用在通知区域运行</translation>
-    </message>
     <message>
         <source>Tray icon style</source>
         <translation>托盘图标样式</translation>
@@ -1212,10 +1123,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>&amp;Advanced</source>
         <translation>高级(&amp;A)</translation>
     </message>
-    <message>
-        <source>Networking</source>
-        <translation>网络</translation>
-    </message>
     <message>
         <source>Port</source>
         <translation>端口</translation>
@@ -1224,10 +1131,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Network IP</source>
         <translation>网络 IP</translation>
     </message>
-    <message>
-        <source>Logs</source>
-        <translation>日志</translation>
-    </message>
     <message>
         <source>Level</source>
         <translation>级别</translation>
@@ -1268,10 +1171,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Log path</source>
         <translation>日志路径</translation>
     </message>
-    <message>
-        <source>Log to file</source>
-        <translation>记录日志到文件</translation>
-    </message>
     <message>
         <source>Using a Debug log level may affect performance. Only use a Debug level if you are attempting to debug an issue or are gathering logs to submit with a bug report.</source>
         <translation>使用调试日志级别可能会影响性能。仅当您尝试调试问题或收集日志以提交 Bug 报告时，才使用调试级别。</translation>
@@ -1288,10 +1187,6 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Always run as system (work at login screen and UAC)</source>
         <translation type="unfinished">始终以系统身份运行 (在登录屏幕和 UAC 下工作)</translation>
     </message>
-    <message>
-        <source>Force a language to be used for the GUI.</source>
-        <translation>强制 GUI 使用特定语言。</translation>
-    </message>
     <message>
         <source>Language</source>
         <translation>语言</translation>
@@ -1344,6 +1239,22 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Verbose debug output</source>
         <translation>详细调试输出</translation>
     </message>
+    <message>
+        <source>Close and save changes</source>
+        <translation type="unfinished">关闭并保存更改</translation>
+    </message>
+    <message>
+        <source>Close and forget changes</source>
+        <translation>关闭并放弃修改</translation>
+    </message>
+    <message>
+        <source>Reset to stored values</source>
+        <translation type="unfinished">重置为存储值</translation>
+    </message>
+    <message>
+        <source>Reset to default values</source>
+        <translation type="unfinished">重置为默认值</translation>
+    </message>
     <message>
         <source>Enable wl-clipboard support</source>
         <translation>启用 wl-clipboard 支持</translation>
@@ -1360,6 +1271,122 @@ Enabling this setting will disable the server config GUI.</source>
         <source>Include version in the window title</source>
         <translation type="unfinished">在窗口标题中包含版本信息</translation>
     </message>
+    <message>
+        <source>Log to file</source>
+        <translation>记录日志到文件</translation>
+    </message>
+    <message>
+        <source>&amp;Logs</source>
+        <translation type="unfinished">日志(&amp;L)</translation>
+    </message>
+    <message>
+        <source>&amp;General</source>
+        <translation>常规(&amp;G)</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>网络(&amp;N)</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">窗户(&amp;W)</translation>
+    </message>
+    <message>
+        <source>When the main window is closed</source>
+        <translation type="unfinished">主窗口关闭时</translation>
+    </message>
+    <message>
+        <source>Exit</source>
+        <translation type="unfinished">出口</translation>
+    </message>
+    <message>
+        <source>Send to background</source>
+        <translation type="unfinished">发送到后台</translation>
+    </message>
+    <message>
+        <source>When the application starts</source>
+        <translation type="unfinished">应用程序启动时</translation>
+    </message>
+    <message>
+        <source>Show the main window</source>
+        <translation type="unfinished">显示主窗口</translation>
+    </message>
+    <message>
+        <source>Run command on enter</source>
+        <translation type="unfinished">按下回车键执行命令</translation>
+    </message>
+    <message>
+        <source>Run command on exit</source>
+        <translation type="unfinished">退出时运行命令</translation>
+    </message>
+</context>
+<context>
+    <name>StatusBar</name>
+    <message>
+        <source>%1 is not running</source>
+        <translation>%1 未在运行</translation>
+    </message>
+    <message>
+        <source>%1 is starting...</source>
+        <translation>%1 正在启动...</translation>
+    </message>
+    <message>
+        <source>%1 will retry in a moment...</source>
+        <translation>%1 将稍后重试...</translation>
+    </message>
+    <message>
+        <source>%1 is stopping...</source>
+        <translation>%1 正在停止...</translation>
+    </message>
+    <message>
+        <source>%1 is waiting for clients</source>
+        <translation>%1 正在等待客户端连接</translation>
+    </message>
+    <message>
+        <source>%1 is connecting...</source>
+        <translation>%1 正在连接...</translation>
+    </message>
+    <message>
+        <source>%1 is connected as client of %2</source>
+        <translation>%1 已作为 %2 的客户端连接</translation>
+    </message>
+    <message>
+        <source>%1 is disconnected</source>
+        <translation>%1 已断开连接</translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 is connected, with %n client(s): %2</source>
+        <extracomment>Shown when in server mode and at least 1 client is connected %1 is replaced by the app name %2 will be a list of at least one client %n will be replaced by the number of clients (n is &gt;=1), it is not requried to be in the translation</extracomment>
+        <translation>
+            <numerusform>%1 已连接，共有 %n 个客户端：%2</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Clients:
+ %1</source>
+        <translation>客户端：
+ %1</translation>
+    </message>
+    <message>
+        <source>A new version v%1 is available</source>
+        <translation>新版本 v%1 可用</translation>
+    </message>
+    <message>
+        <source>View local fingerprint</source>
+        <translation>查看本地指纹</translation>
+    </message>
+    <message>
+        <source>Update available</source>
+        <translation>有可用更新</translation>
+    </message>
+    <message>
+        <source>%1 Encryption Enabled</source>
+        <translation>%1 加密已启用</translation>
+    </message>
+    <message>
+        <source>Encryption Disabled</source>
+        <translation>加密已禁用</translation>
+    </message>
 </context>
 <context>
     <name>i18n</name>