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/datasources/bis/kstdata_bissource.desktop

@@ -5,6 +5,7 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=bissource
 X-Kst-Plugin-Author=C. Barth Netterfield
 Name=Bit Image Stream Reader
+Name[ca]=Lector de fluxos d'imatges BIT
 Name[nl]=Streamleesprogramma van BIT-image
 Name[pt]=Leitor de Fontes de Imagens Bit
 Name[pt_BR]=Leitor de Fontes de Imagens Bit