From a2905823e5cdf1b219e76fee9d5056c77b94c607 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 4 Nov 2020 06:33:19 +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"
---
 src/kontactplugin/kmail/kmailplugin.desktop     | 2 +-
 src/kontactplugin/summary/summaryplugin.desktop | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kontactplugin/kmail/kmailplugin.desktop b/src/kontactplugin/kmail/kmailplugin.desktop
index 8db6e886c..74e46bbe5 100644
--- a/src/kontactplugin/kmail/kmailplugin.desktop
+++ b/src/kontactplugin/kmail/kmailplugin.desktop
@@ -60,7 +60,7 @@ Comment[nb]=Kontact programtillegg for KMail
 Comment[nds]=KMail-Moduul för Kontact
 Comment[ne]=केडीई मेल प्लगइन सम्पर्क गर्नुहोस्
 Comment[nl]=Kontact KMail-plug-in
-Comment[nn]=Kontakt-programtillegg for KMail
+Comment[nn]=Kontact-programtillegg for KMail
 Comment[pa]=ਸੰਪਰਕ ਕੇਮੇਲ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Kontact do współpracy z KMail
 Comment[pt]='Plugin' do KMail para o Kontact
diff --git a/src/kontactplugin/summary/summaryplugin.desktop b/src/kontactplugin/summary/summaryplugin.desktop
index 3ac787f2b..478d7e1d6 100644
--- a/src/kontactplugin/summary/summaryplugin.desktop
+++ b/src/kontactplugin/summary/summaryplugin.desktop
@@ -51,7 +51,7 @@ Comment[nb]=Kontact programtillegg for sammendragsvisning
 Comment[nds]=Översichtansicht-Moduul för Kontact
 Comment[ne]=सारांश दृश्य प्लगइनमा सम्पर्क गर्नुहोस्
 Comment[nl]=Kontact SummaryView-plug-in
-Comment[nn]=Kontakt-tillegg for samandragsvising
+Comment[nn]=Kontact-tillegg for samandragsvising
 Comment[pl]=Wtyczka Kontact do wyświetlania podsumowania
 Comment[pt]='Plugin' do SummaryView do Kontact
 Comment[pt_BR]=Plugin de Visualização do resumo do Kontact