From fe6bb8bd6a076d8293e2090935ee41577324c760 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 3 Jun 2026 02:24:32 +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/kcmdolphingeneral.json | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index a1254bdda..c3ed3212b 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -49,6 +49,7 @@
         "Name[sv]": "Allmänt",
         "Name[ta]": "பொதுவானவை",
         "Name[tr]": "Genel",
+        "Name[ug]": "ئادەتتىكى",
         "Name[uk]": "Загальне",
         "Name[vi]": "Chung",
         "Name[zh_CN]": "常规",
-- 
cgit v1.3.1