From e514898e30ebf70ee992cb74833b855e2acb59b9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 26 Feb 2021 06:51:41 +0100
Subject: [PATCH] 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"
---
 kcms/desktoptheme/plasma-themes.knsrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kcms/desktoptheme/plasma-themes.knsrc b/kcms/desktoptheme/plasma-themes.knsrc
index 1acdecb36..b22f4772d 100644
--- a/kcms/desktoptheme/plasma-themes.knsrc
+++ b/kcms/desktoptheme/plasma-themes.knsrc
@@ -5,6 +5,7 @@ Name[ca]=Temes del Plasma
 Name[es]=Temas de Plasma
 Name[fr]=Thèmes Plasma
 Name[nl]=Plasma-thema's
+Name[sl]=Teme Plasme
 Name[sv]=Plasmateman
 Name[uk]=Теми Плазми
 Name[vi]=Chủ đề Plasma