From e13a47f01ff96e3de87d59dc6d5da61009bba563 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 5 Jan 2024 02:08:48 +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')

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index f168aadda..cc24b6d88 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -32,6 +32,7 @@
         "Name[nb]": "Generelt",
         "Name[nl]": "Algemeen",
         "Name[nn]": "Generelt",
+        "Name[pa]": "ਸਧਾਰਨ",
         "Name[pl]": "Ogólne",
         "Name[pt]": "Geral",
         "Name[pt_BR]": "Geral",
-- 
cgit v1.3