From 3984e607bb4437a38af16e007f1c23fbcff7dfb2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 11 Nov 2019 09:42:43 +0100
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 3e71051ef..6404808ee 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -22,6 +22,7 @@ Name[it]=Dolphin
 Name[ja]=Dolphin
 Name[ko]=Dolphin
 Name[lt]=Dolphin
+Name[lv]=Dolphin
 Name[ml]=ഡോള്‍ഫിന്‍
 Name[nb]=Dolphin
 Name[nl]=Dolphin
@@ -73,6 +74,7 @@ GenericName[it]=Gestore dei file
 GenericName[ja]=ファイルマネージャ
 GenericName[ko]=파일 관리자
 GenericName[lt]=Failų tvarkytuvė
+GenericName[lv]=Datņu pārvaldnieks
 GenericName[ml]=ഫയല്‍ മാനേജര്‍
 GenericName[nb]=Filbehandler
 GenericName[nl]=Bestandsbeheerder
-- 
cgit v1.3