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

@@ -164,6 +164,7 @@ Keywords[ca]=partició;disc;
 Keywords[ca@valencia]=partició;disc;
 Keywords[cs]=oddíl;disk;
 Keywords[es]=partición;disco;
+Keywords[it]=partizione;disco;
 Keywords[nl]=partitie;schijf
 Keywords[pt]=partição;disco;
 Keywords[sr]=partition;disk;партиција;диск;