From 9e23b0d3c600ebcc233b4851cae8fe56cbeb77a2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 24 Oct 2017 05:10:56 +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"
---
 org.kde.kpat.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/org.kde.kpat.desktop b/org.kde.kpat.desktop
index d3da211c..f2f780a3 100755
--- a/org.kde.kpat.desktop
+++ b/org.kde.kpat.desktop
@@ -138,6 +138,7 @@ Comment[sr@ijekavian]=Игра пасијанса
 Comment[sr@ijekavianlatin]=Igra pasijansa
 Comment[sr@latin]=Igra pasijansa
 Comment[sv]=Patienskortspel
+Comment[tr]=Solitaire kart oyunu
 Comment[uk]=Карткова гра у пасьянс
 Comment[x-test]=xxSolitaire card gamexx
 X-DBUS-StartupType=Multi