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/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json

@@ -10,6 +10,7 @@
         "Description[eo]": "Fenestrodekora Etosmotoro",
         "Description[es]": "Motor de temas de decoraciones de las ventanas",
         "Description[eu]": "Leiho-apaindura gaien motorra",
+        "Description[fr]": "Moteur pour les thèmes de décorations de fenêtres",
         "Description[ia]": "Motor de Thema de Decoratione de fenestra",
         "Description[it]": "Motore dei temi delle decorazioni delle finestre",
         "Description[ka]": "ფანჯრის დეკორაციის თემის ძრავა",
@@ -30,6 +31,7 @@
         "Name[eo]": "Aurorae",
         "Name[es]": "Aurorae",
         "Name[eu]": "Aurorae",
+        "Name[fr]": "Aurorae",
         "Name[ia]": "Aurorae",
         "Name[it]": "Aurorae",
         "Name[ka]": "ავრორა",