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

@@ -58,7 +58,7 @@
         "Name[et]": "Kscreen",
         "Name[eu]": "Kscreen",
         "Name[fi]": "KScreen",
-        "Name[fr]": "Kscreen",
+        "Name[fr]": "KScreen",
         "Name[hu]": "Kscreen",
         "Name[ia]": "Kscreen",
         "Name[id]": "KScreen",