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/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/views/versioncontrol/fileviewversioncontrolplugin.desktop')

diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
index efa6bb90c..a04f1cc60 100644
--- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
+++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
@@ -24,6 +24,7 @@ Comment[it]=Estensione di controllo delle versioni per le viste dei file
 Comment[ja]=ファイルビューのためのバージョン管理プラグイン
 Comment[ko]=파일 보기용 버전 제어 플러그인
 Comment[lt]=Failo rodinių versijų tvarkymo papildinys
+Comment[lv]=Versiju kontroles spraudnis priekš datņu skata
 Comment[ml]=ഫയല്‍ അവതരണദിശകൾക്കുള്ള പതിപ്പ് നിയന്ത്രണ സംയോജകം
 Comment[nb]=Versjonskontrollmodul for filvisninger
 Comment[nl]=Plugin voor versiecontrole op bestandoverzichten
-- 
cgit v1.3