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"

dataengines/hotplug/plasma-dataengine-hotplug.desktop

@@ -29,7 +29,7 @@ Name[hu]=Eszközcsatolást kezelő plazmoid
 Name[ia]=Eventos de hotplug
 Name[id]=Acara Hotplug
 Name[is]=Hraðtengingaatburðir
-Name[it]=Eventi di collegamento in marcia
+Name[it]=Eventi di collegamento a caldo
 Name[ja]=Hotplug イベント
 Name[kk]=Істеп турғанда қосу оқиғалар
 Name[km]=ព្រឹត្តិការណ៍​ដោត​ដើរ