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"

src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json

@@ -42,6 +42,7 @@
         "Name[ca]": "Gestos de pantalla tàctil",
         "Name[es]": "Gestos de la pantalla táctil",
         "Name[eu]": "Ukimen-pantailako keinuak",
+        "Name[it]": "Gesti dello schermo tattile",
         "Name[ka]": "სენსორული ეკრანის ჟესტები",
         "Name[nl]": "Veeggebaren voor aanraakscherm",
         "Name[pt]": "Gestos do Ecrã Táctil",