From 020ba2c3fc94336545f6b8d7c13c9a615000482a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 23 Apr 2021 01:19:55 +0000
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/org.kde.dolphin.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/org.kde.dolphin.desktop')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 7020ef70a..63509b476 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -43,6 +43,7 @@ Name[sr@ijekavian]=Делфин
 Name[sr@ijekavianlatin]=Dolphin
 Name[sr@latin]=Dolphin
 Name[sv]=Dolphin
+Name[ta]=டால்பின்
 Name[tr]=Dolphin
 Name[uk]=Dolphin
 Name[vi]=Dolphin
@@ -98,6 +99,7 @@ GenericName[sr@ijekavian]=Менаџер фајлова
 GenericName[sr@ijekavianlatin]=Menadžer fajlova
 GenericName[sr@latin]=Menadžer fajlova
 GenericName[sv]=Filhanterare
+GenericName[ta]=கோப்பு உலாவி
 GenericName[tr]=Dosya Yöneticisi
 GenericName[uk]=Менеджер файлів
 GenericName[vi]=Trình quản lí tệp
-- 
cgit v1.3.1