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

@@ -82,4 +82,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.battery"
     ]
-}
+}

plugins/clipboard/kdeconnect_clipboard.json

@@ -82,4 +82,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.clipboard"
     ]
-}
+}

plugins/findmyphone/kdeconnect_findmyphone.json

@@ -74,4 +74,4 @@
     "X-KdeConnect-OutgoingPackageType": [
         "kdeconnect.findmyphone.request"
     ]
-}
+}

plugins/lockdevice/kdeconnect_lockdevice.json

@@ -80,4 +80,4 @@
         "kdeconnect.lock.request", 
         "kdeconnect.lock"
     ]
-}
+}

plugins/mousepad/kdeconnect_mousepad.json

@@ -80,4 +80,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.mousepad.request"
     ]
-}
+}

plugins/mpriscontrol/kdeconnect_mpriscontrol.json

@@ -82,4 +82,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.mpris.request"
     ]
-}
+}

plugins/mprisremote/kdeconnect_mprisremote.json

@@ -63,4 +63,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.mpris"
     ]
-}
+}

plugins/notifications/kdeconnect_notifications.json

@@ -72,4 +72,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.notification"
     ]
-}
+}

plugins/pausemusic/kdeconnect_pausemusic.json

@@ -79,4 +79,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.telephony"
     ]
-}
+}

plugins/ping/kdeconnect_ping.json

@@ -63,4 +63,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.ping"
     ]
-}
+}

plugins/remotecommands/kdeconnect_remotecommands.json

@@ -63,4 +63,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.runcommand"
     ]
-}
+}

plugins/remotecontrol/kdeconnect_remotecontrol.json

@@ -76,4 +76,4 @@
         "kdeconnect.mousepad.request"
     ], 
     "X-KdeConnect-SupportedPackageType": []
-}
+}

plugins/runcommand/kdeconnect_runcommand.json

@@ -85,4 +85,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.runcommand.request"
     ]
-}
+}

plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json

@@ -76,4 +76,4 @@
         "Version": "0.1", 
         "Website": "http://albertvaka.wordpress.com"
     }
-}
+}

plugins/sendnotifications/kdeconnect_sendnotifications.json

@@ -70,4 +70,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.notification.request"
     ]
-}
+}

plugins/sftp/kdeconnect_sftp.json

@@ -83,4 +83,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.sftp"
     ]
-}
+}

plugins/share/kdeconnect_share.json

@@ -82,4 +82,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.share.request"
     ]
-}
+}

plugins/telephony/kdeconnect_telephony.json

@@ -73,4 +73,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.telephony"
     ]
-}
+}