From a2730fad4323c3af0b5198a31021eed9c9a336e7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 25 Sep 2019 05:15: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/dolphinpart.desktop | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 19c072a02..3d53ecbd6 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -22,7 +22,7 @@ Name[id]=Tampilan Dolphin
 Name[it]=Vista di Dolphin
 Name[ja]=Dolphin ビュー
 Name[ko]=Dolphin 보기
-Name[lt]=Dolphin žiūryklė
+Name[lt]=Dolphin rodinys
 Name[ml]=ഡോള്‍ഫിന്‍ അവതരണരീതി
 Name[nb]=Dolphin visning
 Name[nl]=Dolphin-weergave
@@ -82,7 +82,7 @@ Name[id]=Ikon
 Name[it]=Icone
 Name[ja]=アイコン
 Name[ko]=아이콘
-Name[lt]=Ženkliukai
+Name[lt]=Piktogramos
 Name[ml]=സൂചനാചിത്രങ്ങള്‍
 Name[nb]=Ikoner
 Name[nl]=Pictogrammen
@@ -183,7 +183,7 @@ Name[id]=Perincian
 Name[it]=Dettagli
 Name[ja]=詳細
 Name[ko]=자세히
-Name[lt]=Informacija
+Name[lt]=Išsamus
 Name[ml]=വിശദമായി
 Name[nb]=Detaljer
 Name[nl]=Details
-- 
cgit v1.3.1