From 1bcab9dc25340b83586cb9b7a39e7e7d857ea0c4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 14 Apr 2017 04:00:37 +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"
---
 translations.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/translations.desktop b/translations.desktop
index dda4060bf..016764572 100644
--- a/translations.desktop
+++ b/translations.desktop
@@ -43,6 +43,7 @@ Name[sr@ijekavian]=Језик
 Name[sr@ijekavianlatin]=Jezik
 Name[sr@latin]=Jezik
 Name[sv]=Språk
+Name[tr]=Dil
 Name[uk]=Мова
 Name[x-test]=xxLanguagexx
 Name[zh_CN]=语言