From b9a2df09fcb5f7e1e62b742d32e961437a988da8 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 11 Nov 2019 05:17:33 +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/settings/kcm/kcmdolphinviewmodes.desktop | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 4207d49b0..996e84109 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -21,6 +21,7 @@ Name[it]=Viste di Dolphin
 Name[ja]=Dolphin 表示モード
 Name[ko]=Dolphin 보기 모드
 Name[lt]=Dolphin rodinio veiksenos
+Name[lv]=Dolphin skata režīmi
 Name[ml]=ഡോള്‍ഫിന്‍ അവതരണദശകള്‍
 Name[nb]=Dolphin visningsmåter
 Name[nl]=Dolphin-weergavemodussen
@@ -66,6 +67,7 @@ Comment[it]=Questo servizio permette di configurare le viste di Dolphin.
 Comment[ja]=Dolphin の表示モードを設定します
 Comment[ko]=이 서비스를 통해 Dolphin 보기 모드를 설정할 수 있습니다.
 Comment[lt]=Ši paslauga leidžia Dolphin rodinio veiksenų konfigūravimą.
+Comment[lv]=Šis serviss ļauj konfigurēt Dolphin skata režīmus.
 Comment[ml]=ഡോള്‍ഫിന്‍ അവതരണദശകള്‍ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു.
 Comment[nb]=Med denne tjenesten kan du sette opp Dolphins visningsmåter.
 Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren.
@@ -121,6 +123,7 @@ Name[it]=Viste
 Name[ja]=表示モード
 Name[ko]=보기 모드
 Name[lt]=Rodinio veiksenos
+Name[lv]=Skata režīmi
 Name[ml]=അവതരണ ദശകള്‍
 Name[nb]=Visningsmåter
 Name[nl]=Weergavemodi
@@ -166,6 +169,7 @@ Comment[it]=Configura le viste del gestore dei file
 Comment[ja]=ファイルマネージャの表示モードを設定します
 Comment[ko]=파일 관리자 보기 모드 구성
 Comment[lt]=Konfigūruoti failų tvarkytuvės rodinio veiksenas
+Comment[lv]=Konfigurēt datņu pārvaldnieka skata režīmus
 Comment[ml]=ഫയല്‍ മാനേജറിന്റെ അവതരണ ദശകള്‍ ക്രമീകരിയ്ക്കുക
 Comment[nb]=Tilpass filbehandlerens visningsmåter
 Comment[nl]=Bestandsbeheerderweergavemodussen configureren
@@ -212,6 +216,7 @@ X-KDE-Keywords[it]=gestore dei file
 X-KDE-Keywords[ja]=ファイルマネージャ
 X-KDE-Keywords[ko]=파일 관리자
 X-KDE-Keywords[lt]=failų tvarkytuvė
+X-KDE-Keywords[lv]=datņu pārvaldnieks
 X-KDE-Keywords[ml]=ഫയൽ മാനേജർ 
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
-- 
cgit v1.3