From 6073f2552581e495e5aa4481c7e322a20ea727a0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 30 Oct 2024 01:23:40 +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/krfb.notifyrc                             | 4 ++--
 krfb/org.kde.krfb.desktop                      | 1 +
 krfb/org.kde.krfb.virtualmonitor.desktop.cmake | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/krfb/krfb.notifyrc b/krfb/krfb.notifyrc
index d62b31d6..fac0f86c 100644
--- a/krfb/krfb.notifyrc
+++ b/krfb/krfb.notifyrc
@@ -380,7 +380,7 @@ Name[kk]=Қосылымдан жабылды
 Name[km]=បាន​បិទ​ការ​ត​ភ្ជាប់
 Name[ko]=연결이 닫힘
 Name[lt]=Ryšys baigtas
-Name[lv]=Savienojums slēgts
+Name[lv]=Savienojums ir slēgts
 Name[mai]=संबंधन बन्न भ' गेल
 Name[ml]=ബന്ധം അടച്ചു
 Name[mr]=जुळवणी बंद केली
@@ -448,7 +448,7 @@ Comment[kk]=Қосылым жабылды
 Comment[km]=បាន​បិទ​ការ​ត​ភ្ជាប់
 Comment[ko]=연결이 닫힘
 Comment[lt]=Ryšys baigtas
-Comment[lv]=Savienojums tika slēgts
+Comment[lv]=Savienojums ir slēgts
 Comment[mk]=Поврзувањето е затворено
 Comment[ml]=ബന്ധം അടച്ചു
 Comment[mr]=जुळवणी बंद केली
diff --git a/krfb/org.kde.krfb.desktop b/krfb/org.kde.krfb.desktop
index 06339f92..4faf55ab 100755
--- a/krfb/org.kde.krfb.desktop
+++ b/krfb/org.kde.krfb.desktop
@@ -100,6 +100,7 @@ GenericName[it]=Condivisione del desktop (VNC)
 GenericName[ka]=სამუშაო მაგიდის გაზიარება(VNC).
 GenericName[ko]=데스크톱 공유(VNC)
 GenericName[lt]=Darbalaukio bendrinimas (VNC)
+GenericName[lv]=Darbvirsmas koplietošana (VNC)
 GenericName[nl]=Bureaublad delen (VNC)
 GenericName[nn]=Skrivebordsdeling (VNC)
 GenericName[pl]=Współdzielenie pulpitu (VNC)
diff --git a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
index 45f5232a..851fbf40 100644
--- a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
+++ b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
@@ -25,6 +25,7 @@ Name[it]=Monitor virtuale di KRFB
 Name[ka]=KRFB-ის ვირტუალური ეკრანი
 Name[ko]=KRFBs 가상 모니터
 Name[lt]=KRFBs virtualus monitorius
+Name[lv]=KRFB virtuālais monitors
 Name[nl]=Virtuele monitor van KRFB
 Name[nn]=KRFBs virtuell skjerm
 Name[pl]=Monitor wirtualny KRFB
@@ -61,6 +62,7 @@ Comment[it]=Monitor virtuale remoto
 Comment[ka]=დაშორებული ვირტუალური ეკრანი
 Comment[ko]=원격 가상 모니터
 Comment[lt]=Nuotolinis virtualus monitorius
+Comment[lv]=Attālais virtuālais monitors
 Comment[nl]=Virtual Monitor op afstand
 Comment[nn]=Virtuell skjerm for ekstern ressurs
 Comment[pl]=Zdalny monitor wirtualny