From 384cfdcbedc603c0b5caf4dcb74161bc0e1bf468 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 25 Nov 2021 01:30:05 +0000
Subject: [PATCH] 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"
---
 krfb/org.kde.krfb.virtualmonitor.desktop.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
index 59b587e..f06dcbf 100644
--- a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
+++ b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
@@ -11,6 +11,7 @@ Name[el]=Εικονική οθόνη του KRFB
 Name[es]=Monitor virtual de KRFB
 Name[fr]=Moniteur virtuel « Krfb »
 Name[ia]=Virtual Monitor de KRFB
+Name[it]=Monitor virtuale di KRFB
 Name[ko]=KRFBs 가상 모니터
 Name[nl]=Virtuele monitor van KRFB
 Name[pl]=Monitor wirtualny KRFB
@@ -27,6 +28,7 @@ Comment[el]=Απομακρυσμένη εικονική οθόνη
 Comment[es]=Monitor virtual remoto
 Comment[fr]=Moniteur virtuel distant
 Comment[ia]=Monitor Virtual Remote
+Comment[it]=Monitor virtuale remoto
 Comment[ko]=원격 가상 모니터
 Comment[nl]=Virtual Monitor op afstand
 Comment[pl]=Zdalny monitor wirtualny