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"

src/kcms/desktop/kcm_kwin_virtualdesktops.json

@@ -47,6 +47,7 @@
         "Icon": "preferences-desktop-virtual",
         "Name": "Virtual Desktops",
         "Name[ar]": "أسطح المكتب الافتراضية",
+        "Name[ast]": "Escritorios virtuales",
         "Name[az]": "Virtual iş masaları",
         "Name[be]": "Віртуальныя працоўныя сталы",
         "Name[bg]": "Виртуални работни плотове",

src/kwin.notifyrc

@@ -360,6 +360,7 @@ Name[zh_CN]=Xwayland 崩溃
 Name[zh_TW]=Xwayland 崩潰
 Comment=Xwayland has crashed
 Comment[ar]=إنهار ويلاند_اكس
+Comment[ast]=Xwayland cascó
 Comment[az]=Xwayland qəzaya uğradı
 Comment[be]=Адбыўся збой Xwayland
 Comment[bg]=Xwayland се срина