From 00eebe09e017a3d837ecffba8a4af7ecbd433ded Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 22 Jul 2016 10:00:58 +0000
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"
---
 translations.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/translations.desktop b/translations.desktop
index b7d5e2211..3b5aa0af7 100644
--- a/translations.desktop
+++ b/translations.desktop
@@ -14,6 +14,7 @@ X-KDE-Weight=40
 Name=Language
 Name[ca]=Idioma
 Name[ca@valencia]=Idioma
+Name[cs]=Jazyk
 Name[es]=Idioma
 Name[nl]=Taal
 Name[nn]=Språk