From 2ef898871fd1efeb688415194d4045425dd6dd73 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 15 Oct 2018 05:44:34 +0200
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"
---
 sddmtheme.knsrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sddmtheme.knsrc b/sddmtheme.knsrc
index a0c860c..aa00b69 100644
--- a/sddmtheme.knsrc
+++ b/sddmtheme.knsrc
@@ -1,7 +1,9 @@
 [KNewStuff3]
 Name=Login Screen
 Name[ca]=Pantalla d'inici de sessió
+Name[ca@valencia]=Pantalla d'inici de sessió
 Name[fr]=Écran de connexion
+Name[id]=Login Screen
 Name[nl]=Aanmeldscherm
 Name[nn]=Innloggingsbilete
 Name[pt]=Ecrã de Autenticação
-- 
GitLab