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/lockdevice/kdeconnect_lockdevice.json

@@ -113,7 +113,7 @@
         "Name[et]": "Seadme lukustamine",
         "Name[eu]": "BlokeatuGailua",
         "Name[fi]": "Lukitse laite",
-        "Name[fr]": "LockDevice",
+        "Name[fr]": "Verrouiller un périphérique",
         "Name[gl]": "Bloqueo do dispositivo",
         "Name[hu]": "Eszközzárolás",
         "Name[ia]": "Bloca Dispositivo",

plugins/mprisremote/kdeconnect_mprisremote.json

@@ -113,7 +113,7 @@
         "Name[et]": "Kaug-Mpris",
         "Name[eu]": "MprisRemote",
         "Name[fi]": "MPRIS-kauko-ohjain",
-        "Name[fr]": "MprisRemote",
+        "Name[fr]": "Télécommande « MPris »",
         "Name[gl]": "MprisRemote",
         "Name[hu]": "MprisRemote",
         "Name[ia]": "MprisRemote",

plugins/remotecontrol/kdeconnect_remotecontrol.json

@@ -113,7 +113,7 @@
         "Name[et]": "Kaugjuhtimine",
         "Name[eu]": "UrrunekoKontrola",
         "Name[fi]": "Kauko-ohjain",
-        "Name[fr]": "RemoteControl",
+        "Name[fr]": "Télécommande",
         "Name[gl]": "Mando a distancia",
         "Name[hu]": "Távirányítás",
         "Name[ia]": "Controlo Remote",