From 18cd42837f746984ae603513995c07fac8636b75 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 17 Jan 2024 01:13:46 +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 5c15b5a71..975e181b7 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -30,6 +30,7 @@
         "Name[ka]": "მთავარი",
         "Name[ko]": "일반",
         "Name[lt]": "Bendrosios",
+        "Name[lv]": "Vispārīgi",
         "Name[nb]": "Generelt",
         "Name[nl]": "Algemeen",
         "Name[nn]": "Generelt",
-- 
cgit v1.3