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/plasma/packagestructure/dataengine-packagestructure.json

@@ -22,6 +22,7 @@
         "Name[es]": "Motor de datos", 
         "Name[et]": "Andmemootor", 
         "Name[fi]": "Tietomoottori", 
+        "Name[fr]": "Moteur de données", 
         "Name[it]": "Motore dati", 
         "Name[ko]": "데이터 엔진", 
         "Name[nl]": "Gegevensengine", 

src/plasma/packagestructure/plasmageneric-packagestructure.json

@@ -21,6 +21,7 @@
         "Name[es]": "General", 
         "Name[et]": "Üldine", 
         "Name[fi]": "Yleinen", 
+        "Name[fr]": "Générique", 
         "Name[it]": "Generico", 
         "Name[ko]": "일반", 
         "Name[nl]": "Algemeen", 

src/plasma/packagestructure/plasmatheme-packagestructure.json

@@ -22,6 +22,7 @@
         "Name[es]": "Tema de Plasma", 
         "Name[et]": "Plasma teema", 
         "Name[fi]": "Plasma-teema", 
+        "Name[fr]": "Thème Plasma pour les thèmes foncés", 
         "Name[it]": "Tema di Plasma", 
         "Name[ko]": "Plasma 테마", 
         "Name[nl]": "Plasma-thema", 

src/plasma/packagestructure/plasmoid-packagestructure.json

@@ -18,6 +18,7 @@
         "Name[el]": "Πλασμοειδές", 
         "Name[es]": "Plasmoide", 
         "Name[fi]": "Plasmoidi", 
+        "Name[fr]": "Plasmoïde", 
         "Name[it]": "Plasmoide", 
         "Name[nn]": "Plasmoide", 
         "Name[pl]": "Plazmoid",