From e18d0b233ecb053e64d531126db4767a1ad59bd9 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Mon, 17 Feb 2025 08:04:04 +0000
Subject: [PATCH] Translate conflicts.pot in zh_HK

100% translated source file: 'conflicts.pot'
on 'zh_HK'.
---
 user_manual/locale/zh_HK/LC_MESSAGES/desktop/conflicts.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_manual/locale/zh_HK/LC_MESSAGES/desktop/conflicts.pot b/user_manual/locale/zh_HK/LC_MESSAGES/desktop/conflicts.pot
index 7fe88ccd1..3c3fe186e 100644
--- a/user_manual/locale/zh_HK/LC_MESSAGES/desktop/conflicts.pot
+++ b/user_manual/locale/zh_HK/LC_MESSAGES/desktop/conflicts.pot
@@ -62,7 +62,7 @@ msgid ""
 "When attempting to upload your local changes the desktop client will notice "
 "that the server version has also changed. It creates a conflict and you will"
 " now have two files on your local machine:"
-msgstr "當您嘗試上傳本地更改時，桌面客戶端會注意到服務器版本也已更改。它會創建一個衝突，您現在在本地計算機上將會有兩個檔案："
+msgstr "當您嘗試上傳近端更改時，桌面客戶端會注意到伺服器版本也已更改。它會創建一個衝突，您現在在近端計算機上將會有兩個檔案："
 
 #: ../../desktop/conflicts.rst:26
 msgid "``mydata.txt`` containing \"remote contents\""