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"

events/xdp/krfb_events_xdp.json

@@ -13,4 +13,3 @@
         "Website": "http://www.kde.org"
     }
 }
-

krfb/krfb-events.desktop

@@ -3,6 +3,4 @@ Type=ServiceType
 X-KDE-ServiceType=krfb/events
 
 Comment=Event plugins for KRfb
-Comment[ru]=Модули обработки событий для Krfb
-Comment[x-test]=xxEvent plugins for KRfbxx
 

krfb/krfb-events.json

@@ -1,7 +1,6 @@
 {
     "KPlugin": {
-        "Description": "Events plugins for KRfb",
-        "Description[x-test]": "xxFrame Buffer plugins for KRfbxx"
+        "Description": "Events plugins for KRfb"
     },
     "X-KDE-ServiceType": "krfb/events"
 }