From f8c292c556b87a19e9099cc98bf0ab88424472b2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 20 Sep 2021 01:28:18 +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 9489ab370..0031f088c 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -27,6 +27,7 @@ Name[ko]=Dolphin
 Name[lt]=Dolphin
 Name[lv]=Dolphin
 Name[ml]=ഡോള്‍ഫിന്‍
+Name[my]=လင်းပိုင်
 Name[nb]=Dolphin
 Name[nl]=Dolphin
 Name[nn]=Dolphin
@@ -84,6 +85,7 @@ GenericName[ko]=파일 관리자
 GenericName[lt]=Failų tvarkytuvė
 GenericName[lv]=Datņu pārvaldnieks
 GenericName[ml]=ഫയല്‍ മാനേജര്‍
+GenericName[my]=ဖိုင်လ်မန်နေဂျာ
 GenericName[nb]=Filbehandler
 GenericName[nl]=Bestandsbeheerder
 GenericName[nn]=Filhandsamar
-- 
cgit v1.3