From f90c6d251646399dcdf973ff5997d7d581c79b3f 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:07:09 +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 a2e4cd075..9cab87959 100644
--- a/user_manual/locale/zh_HK/LC_MESSAGES/desktop/conflicts.pot
+++ b/user_manual/locale/zh_HK/LC_MESSAGES/desktop/conflicts.pot
@@ -127,7 +127,7 @@ msgid ""
 "However, in some scenarios it makes a lot of sense to upload these "
 "conflicting changes such that local work can become visible even if the "
 "conflict won't be resolved immediately."
-msgstr "然而，在某些情況下，上傳這些衝突的更改是非常合理的，這樣即使衝突不會立即解決，本地工作也能變得可見。"
+msgstr "然而，在某些情況下，上傳這些衝突的更改是非常合理的，這樣即使衝突不會立即解決，近端工作也能變得可見。"
 
 #: ../../desktop/conflicts.rst:57
 msgid ""