From 080572c67a3eb02288886c7fc8a170ae8f151d97 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 26 Mar 2023 01:45:57 +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')

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index f6ad02235..584aed1f0 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -18,6 +18,7 @@
         "Name[eu]": "Orokorra",
         "Name[fi]": "Perusasetukset",
         "Name[fr]": "Général",
+        "Name[gl]": "Xeral",
         "Name[hi]": "साधारण",
         "Name[ia]": "General",
         "Name[id]": "Umum",
-- 
cgit v1.3