From 8560c73e677186572a134ba427443924eeda9646 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 19 Jul 2024 01:21:28 +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 1805822e3..c2fd44577 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -10,6 +10,7 @@
         "Name[cs]": "Obecné",
         "Name[da]": "Generelt",
         "Name[de]": "Allgemein",
+        "Name[el]": "Γενικά",
         "Name[eo]": "Ĝenerala",
         "Name[eu]": "Orokorra",
         "Name[fi]": "Perusasetukset",
-- 
cgit v1.3.1