From f14350e1bb8976bc6a0a5dfb40ae0c4f5e3ee0a3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Jul 2021 01:17:06 +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"
---
 .../kpackage/scripts/kwin-packagestructure-scripts.desktop       | 1 +
 src/plugins/platforms/x11/windowed/x11.json                      | 1 +
 src/scripting/kwinscript.desktop                                 | 1 +
 src/scripts/videowall/metadata.desktop                           | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.desktop b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.desktop
index 671847ad8e..3051bbfbef 100644
--- a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.desktop
+++ b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=KWin Script
+Name[ar]=سكربت كوين
 Name[az]=Kwin skripti
 Name[ca]=Script del KWin
 Name[ca@valencia]=Script de KWin
diff --git a/src/plugins/platforms/x11/windowed/x11.json b/src/plugins/platforms/x11/windowed/x11.json
index ebeb705e35..8f7c048998 100644
--- a/src/plugins/platforms/x11/windowed/x11.json
+++ b/src/plugins/platforms/x11/windowed/x11.json
@@ -39,6 +39,7 @@
         "Description[zh_TW]": "成像到 X11 視窗系統的巢狀視窗。",
         "Id": "KWinWaylandX11Backend",
         "Name": "x11",
+        "Name[ar]": "اكس ١١",
         "Name[az]": "x11",
         "Name[ca@valencia]": "X11",
         "Name[ca]": "X11",
diff --git a/src/scripting/kwinscript.desktop b/src/scripting/kwinscript.desktop
index c2046ddeff..41a1288395 100644
--- a/src/scripting/kwinscript.desktop
+++ b/src/scripting/kwinscript.desktop
@@ -3,6 +3,7 @@ Type=ServiceType
 X-KDE-ServiceType=KWin/Script
 
 Comment=KWin Script
+Comment[ar]=سكربت كوين
 Comment[az]=Kwin skripti
 Comment[bs]=KWin skripta
 Comment[ca]=Script del KWin
diff --git a/src/scripts/videowall/metadata.desktop b/src/scripts/videowall/metadata.desktop
index b6af628970..0bd475deb0 100644
--- a/src/scripts/videowall/metadata.desktop
+++ b/src/scripts/videowall/metadata.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Video Wall
+Name[ar]=جدار الفيديو
 Name[az]=Videolu Divar Kağızı
 Name[bs]=Video zid
 Name[ca]=Mur de vídeo