From 572f4d2e9ac5dcb188630281227b545af41275bb Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 30 Jan 2023 02:05:00 +0000
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 src/settings/kcm/kcmdolphinnavigation.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/settings/kcm/kcmdolphinnavigation.json')

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index e7e152f27..bd6b2cef6 100644
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -41,6 +41,7 @@
         "Description[vi]": "Cấu hình điều hướng trình quản lí tệp",
         "Description[x-test]": "xxConfigure file manager navigationxx",
         "Description[zh_CN]": "配置文件管理器导航功能",
+        "Description[zh_TW]": "設定檔案管理員導覽",
         "Icon": "preferences-desktop-navigation",
         "Name": "Navigation",
         "Name[ar]": "التّنقّل",
-- 
cgit v1.3