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/dolphinpart.desktop | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 3d53ecbd6..ca3f48c48 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -23,6 +23,7 @@ Name[it]=Vista di Dolphin
 Name[ja]=Dolphin ビュー
 Name[ko]=Dolphin 보기
 Name[lt]=Dolphin rodinys
+Name[lv]=Dolphin skats
 Name[ml]=ഡോള്‍ഫിന്‍ അവതരണരീതി
 Name[nb]=Dolphin visning
 Name[nl]=Dolphin-weergave
@@ -83,6 +84,7 @@ Name[it]=Icone
 Name[ja]=アイコン
 Name[ko]=아이콘
 Name[lt]=Piktogramos
+Name[lv]=Ikonas
 Name[ml]=സൂചനാചിത്രങ്ങള്‍
 Name[nb]=Ikoner
 Name[nl]=Pictogrammen
@@ -134,6 +136,7 @@ Name[it]=Compatta
 Name[ja]=コンパクト
 Name[ko]=축소됨
 Name[lt]=Kompaktiškas
+Name[lv]=Kompakts
 Name[ml]=തിങ്ങിയതായി
 Name[nb]=Kompakt
 Name[nl]=Compact
@@ -184,6 +187,7 @@ Name[it]=Dettagli
 Name[ja]=詳細
 Name[ko]=자세히
 Name[lt]=Išsamus
+Name[lv]=Detaļas
 Name[ml]=വിശദമായി
 Name[nb]=Detaljer
 Name[nl]=Details
-- 
cgit v1.3