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/hdf5/kstdata_hdf5.desktop

@@ -5,4 +5,16 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=hdf5
 X-Kst-Plugin-Author=The University of Toronto
 Name=HDF5 Reader
+Name[ca]=Lector de HDF5
+Name[nl]=Leesprogramma DirFile
+Name[pt]=Leitor de HDF5
+Name[sv]=HDF5-läsare
+Name[uk]=Засіб читання HDF5
+Name[x-test]=xxHDF5 Readerxx
 Comment=Plugin that reads HDF5 files
+Comment[ca]=Connector per llegir fitxers HDF5
+Comment[nl]=Plug-in voor het lezen van HDF5-bestanden.
+Comment[pt]=Um 'plugin' para ler ficheiros em HDF5
+Comment[sv]=Insticksprogram som läser HDF5-filer.
+Comment[uk]=Додаток для читання файлів HDF5
+Comment[x-test]=xxPlugin that reads HDF5 filesxx