From e5c86dc295e1653da238f505a9c859da5207eaf0 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:05:32 +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 92974fab5..a5fc03a73 100644
--- a/user_manual/locale/zh_HK/LC_MESSAGES/desktop/conflicts.pot
+++ b/user_manual/locale/zh_HK/LC_MESSAGES/desktop/conflicts.pot
@@ -82,7 +82,7 @@ msgid ""
 "enables conflict uploading, see below)."
 msgstr ""
 "在這種情況下，檔案 ``mydata.txt`` "
-"擁有遠端更改（並將在有進一步的遠端更改時繼續更新），但您的本地調整尚未發送到伺服器（除非伺服器啟用衝突上傳，請參見下文）。"
+"擁有遠端更改（並將在有進一步的遠端更改時繼續更新），但您的近端調整尚未發送到伺服器（除非伺服器啟用衝突上傳，請參見下文）。"
 
 #: ../../desktop/conflicts.rst:34
 msgid ""