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

@@ -87,7 +87,7 @@
         "Name[sl]": "Pokaži št. sličic na sekundo",
         "Name[sv]": "Visa ramar/s",
         "Name[ta]": "FPS-ஐ காட்டு",
-        "Name[tr]": "FPS'yi Göster",
+        "Name[tr]": "FPS’yi Göster",
         "Name[uk]": "Показ частоти кадрів",
         "Name[vi]": "Hiện FPS",
         "Name[x-test]": "xxShow FPSxx",