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/org.kde.partitionmanager.desktop

@@ -161,3 +161,9 @@ Categories=System;Filesystem;KDE;Qt;
 
 X-KDE-StartupNotify=true
 Keywords=partition;disk;
+Keywords[ca]=partició;disc;
+Keywords[nl]=partitie;schijf
+Keywords[pt]=partição;disco;
+Keywords[sv]=partition;disk;
+Keywords[uk]=розділ;диск;
+Keywords[x-test]=xxpartitionxx;xxdiskxx;