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/effects/tileseditor/metadata.json

@@ -7,6 +7,7 @@
         "Description[ca]": "Editor per a les àrees de mosaic",
         "Description[es]": "Editor para las áreas de mosaico",
         "Description[eu]": "Eremu lauzatuen editorea",
+        "Description[fr]": "Éditeur pour les zones de recouvrement",
         "Description[nl]": "Bewerker voor de gebieden waar tegels worden geplaatst",
         "Description[pl]": "Edytor dla obszarów kafelkowanych",
         "Description[pt]": "Editor das áreas com padrões",
@@ -22,6 +23,7 @@
         "Name[ca]": "Editor de mosaic",
         "Name[es]": "Editor de mosaico",
         "Name[eu]": "Lauzadura editorea",
+        "Name[fr]": "Éditeur pour la gestion des recouvrements",
         "Name[nl]": "Bewerker voor tegels plaatsen",
         "Name[pl]": "Edytor kafelków",
         "Name[pt]": "Editor de Padrões",

src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json

@@ -43,6 +43,7 @@
         "Name[ca]": "Gestos de pantalla tàctil",
         "Name[es]": "Gestos de la pantalla táctil",
         "Name[eu]": "Ukimen-pantailako keinuak",
+        "Name[fr]": "Gestes de balayage de l'écran tactile",
         "Name[it]": "Gesti dello schermo tattile",
         "Name[ka]": "სენსორული ეკრანის ჟესტები",
         "Name[nl]": "Veeggebaren voor aanraakscherm",