From 1da563ca71ab8b64fe1741b0c57980aa2011daea Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 25 Feb 2024 01:15:01 +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.desktop                      | 3 ++-
 krfb/org.kde.krfb.virtualmonitor.desktop.cmake | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/krfb/org.kde.krfb.desktop b/krfb/org.kde.krfb.desktop
index 2721f8cc..5888b673 100755
--- a/krfb/org.kde.krfb.desktop
+++ b/krfb/org.kde.krfb.desktop
@@ -7,7 +7,7 @@ X-DBUS-StartupType=Unique
 X-DocPath=krfb/index.html
 Terminal=false
 Name=Krfb
-Name[ar]=Krfb
+Name[ar]=كرفب
 Name[bg]=Krfb
 Name[bn]=কে-আর-এফ-বি
 Name[br]=Krfb
@@ -76,6 +76,7 @@ Name[zh_CN]=Krfb
 Name[zh_HK]=Krfb
 Name[zh_TW]=桌面分享_Krfb
 GenericName=Desktop Sharing (VNC)
+GenericName[ar]=مشاركة سطح المكتب (VNC)
 GenericName[ca]=Compartició de l'escriptori (VNC)
 GenericName[ca@valencia]=Compartició de l'escriptori (VNC)
 GenericName[cs]=Sdílení pracovní plochy (VNC)
diff --git a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
index 32087c86..29f31ead 100644
--- a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
+++ b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
@@ -5,6 +5,7 @@ Exec=@CMAKE_INSTALL_PREFIX@/bin/krfb-virtualmonitor
 Icon=krfb
 Terminal=false
 Name=KRFBs Virtual Monitor
+Name[ar]=شاشة افتراضية لكرفب
 Name[ca]=Monitor virtual del Krfb
 Name[ca@valencia]=Monitor virtual de Krfb
 Name[cs]=Virtuální monitor KRFB
@@ -39,6 +40,7 @@ Name[x-test]=xxKRFBs Virtual Monitorxx
 Name[zh_CN]=KRBs 虚拟监视器
 Name[zh_TW]=KRFBs 虛擬螢幕
 Comment=Remote Virtual Monitor
+Comment[ar]=شاشة افتراضية بعيدة
 Comment[ca]=Monitor virtual remot
 Comment[ca@valencia]=Monitor virtual remot
 Comment[cs]=Vzdálený virtuální monitor