From 3c1d55886fb5d65e841028ef6c5914660b9e6d5b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 8 Aug 2018 07:39:26 +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"
---
 applets/spacer/metadata.desktop.cmake   | 1 +
 applets/spacer/package/metadata.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/applets/spacer/metadata.desktop.cmake b/applets/spacer/metadata.desktop.cmake
index 2599316b5..66115780f 100644
--- a/applets/spacer/metadata.desktop.cmake
+++ b/applets/spacer/metadata.desktop.cmake
@@ -50,6 +50,7 @@ Type=Service
 Keywords=spacer
 Keywords[ca]=espaiador
 Keywords[ca@valencia]=espaiador
+Keywords[cs]=oddělovač
 Keywords[da]=afstandsstykke
 Keywords[de]=Abstandshalter
 Keywords[el]=κενό
diff --git a/applets/spacer/package/metadata.desktop b/applets/spacer/package/metadata.desktop
index 2599316b5..66115780f 100644
--- a/applets/spacer/package/metadata.desktop
+++ b/applets/spacer/package/metadata.desktop
@@ -50,6 +50,7 @@ Type=Service
 Keywords=spacer
 Keywords[ca]=espaiador
 Keywords[ca@valencia]=espaiador
+Keywords[cs]=oddělovač
 Keywords[da]=afstandsstykke
 Keywords[de]=Abstandshalter
 Keywords[el]=κενό