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"
2021-07-20 01:17:06 +00:00 · 2021-07-20 01:17:06 +00:00 · f14350e1bb
commit f14350e1bb
parent d29954ae33
4 changed files with 4 additions and 0 deletions
--- 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
--- 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",
--- 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
--- 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