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"

plugins/battery/kdeconnect_battery.json

@@ -26,7 +26,7 @@
         "Description[x-test]": "xxShow your phone battery next to your computer batteryxx", 
         "Description[zh_CN]": "在计算机电池旁显示手机电池", 
         "EnabledByDefault": true, 
-        "Icon": "preferences-system-power-management",
+        "Icon": "preferences-system-power-management", 
         "Id": "kdeconnect_battery", 
         "License": "GPL", 
         "Name": "Battery monitor", 

plugins/mousepad/kdeconnect_mousepad.json

@@ -26,7 +26,7 @@
         "Description[x-test]": "xxUse your phone as a touchpad and keyboardxx", 
         "Description[zh_CN]": "用您的手机作为触摸板和键盘", 
         "EnabledByDefault": true, 
-        "Icon": "edit-select",
+        "Icon": "edit-select", 
         "Id": "kdeconnect_mousepad", 
         "License": "GPL", 
         "Name": "Virtual input",