From 2de9e4fc165bcadd54f81b7d17904c45632705f5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 14 Aug 2019 05:06:10 +0200
Subject: 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"
---
 src/core/kconfigbackend.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop
index c0bebe09..0a7793fd 100644
--- a/src/core/kconfigbackend.desktop
+++ b/src/core/kconfigbackend.desktop
@@ -73,7 +73,7 @@ Comment[sr@ijekavianlatin]=Skladišna pozadina za KConfig
 Comment[sr@latin]=Skladišna pozadina za KConfig
 Comment[sv]=Lagringsgränssnitt för KConfig
 Comment[ta]=கேவடிவமைப்பிற்கான பின்னணி சேமிப்பகம்
-Comment[tg]=Пуштибонии захирагоҳ барои KConfig
+Comment[tg]=Коркардкунандаи захирагоҳ барои KConfig
 Comment[th]=โปรแกรมเบื้องหลังพื้นที่จัดเก็บข้อมูลสำหรับ KConfig
 Comment[tr]=KConfig için Depolama Arka Ucu
 Comment[tt]=KConfig өчен саклау бэкенды
-- 
cgit v1.2.1