From d7430e0e177affd186d7d780731f397a058cdc16 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 23 Aug 2019 05:03:12 +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"
---
 calindac/calindac.notifyrc      | 2 ++
 org.kde.phone.calindori.desktop | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/calindac/calindac.notifyrc b/calindac/calindac.notifyrc
index f67c867..5bb2424 100644
--- a/calindac/calindac.notifyrc
+++ b/calindac/calindac.notifyrc
@@ -15,6 +15,7 @@ Comment[uk]=Календар для мобільної Плазми
 Comment[x-test]=xxPlasma Mobile Calendarxx
 Name=Calindori
 Name[ca]=Calindori
+Name[cs]=Calindori
 Name[de]=Calindori
 Name[es]=Calindori
 Name[fr]=Calindori
@@ -58,6 +59,7 @@ Comment[x-test]=xxThe uid of the incidence of the alarmxx
 [Event/alarm]
 Name=Alarm
 Name[ca]=Alarma
+Name[cs]=Alarm
 Name[de]=Erinnerung
 Name[es]=Alarma
 Name[fr]=Alarme
diff --git a/org.kde.phone.calindori.desktop b/org.kde.phone.calindori.desktop
index 62df482..804721b 100644
--- a/org.kde.phone.calindori.desktop
+++ b/org.kde.phone.calindori.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Calindori
 Name[ca]=Calindori
+Name[cs]=Calindori
 Name[de]=Calindori
 Name[es]=Calindori
 Name[fr]=Calindori
@@ -14,6 +15,7 @@ Name[uk]=Calindori
 Name[x-test]=xxCalindorixx
 Comment=Calindori
 Comment[ca]=Calindori
+Comment[cs]=Calindori
 Comment[de]=Calindori
 Comment[es]=Calindori
 Comment[fr]=Calindori
-- 
2.24.0