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/clipboard/kdeconnect_clipboard.json

@@ -56,7 +56,7 @@
         "Description[fr]": "Partagez le presse-papiers entre périphériques",
         "Description[gl]": "Comparta o portapapeis entre os dispositivos",
         "Description[hu]": "A vágólap megosztása az eszközök között",
-        "Description[id]": "Berbagi clipboard antara perangkat",
+        "Description[id]": "Berbagi papan-klip antara perangkat",
         "Description[it]": "Condividi gli appunti tra i dispositivi",
         "Description[ja]": "デバイス間でクリップボードを共有",
         "Description[ko]": "장치간 클립보드 공유",
@@ -98,7 +98,7 @@
         "Name[gl]": "Portapapeis",
         "Name[hu]": "Vágólap",
         "Name[ia]": "Area de transferentia",
-        "Name[id]": "Clipboard",
+        "Name[id]": "Papan-klip",
         "Name[it]": "Appunti",
         "Name[ja]": "クリップボード",
         "Name[ko]": "클립보드",