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/settings/kcm/kcmdolphinservices.desktop | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/settings/kcm/kcmdolphinservices.desktop')

diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 4f547d5a7..e3330af5d 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -20,7 +20,7 @@ Name[id]=Layanan Dolphin
 Name[it]=Servizi di Dolphin
 Name[ja]=Dolphin サービス
 Name[ko]=Dolphin 서비스
-Name[lt]=Dolphin tarnybos
+Name[lt]=Dolphin paslaugos
 Name[ml]=ഡോള്‍ഫിന്‍ സേവനങ്ങള്‍
 Name[nb]=Dolphin-tjenester
 Name[nl]=Dolphin-services
@@ -120,7 +120,7 @@ Comment[id]=Konfigurasikan layanan pengelola file
 Comment[it]=Configura i servizi del gestore dei file
 Comment[ja]=ファイルマネージャのサービスを設定します
 Comment[ko]=파일 관리자 서비스 설정
-Comment[lt]=Konfigūruokite failų tvarkyklės tarnybas
+Comment[lt]=Konfigūruoti failų tvarkytuvės paslaugas
 Comment[ml]=ഫയല്‍ മാനേജർ സേവനങ്ങള്‍ ക്രമീകരിയ്ക്കുക
 Comment[nb]=Sett opp tjenester i filbehandleren
 Comment[nl]=Bestandsbeheerderservices configureren
@@ -165,7 +165,7 @@ X-KDE-Keywords[id]=pengelola file
 X-KDE-Keywords[it]=gestore dei file
 X-KDE-Keywords[ja]=ファイルマネージャ
 X-KDE-Keywords[ko]=파일 관리자
-X-KDE-Keywords[lt]=Failų tvarkyklė
+X-KDE-Keywords[lt]=failų tvarkytuvė
 X-KDE-Keywords[ml]=ഫയൽ മാനേജർ 
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
-- 
cgit v1.3.1