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/core-impl/collections/umscollection/amarok_collection-umscollection.desktop

@@ -22,7 +22,7 @@ Name[gl]=Colección de almacenamento masivo universal
 Name[hu]=Univerzális tárolóhoz (UMS) tartozó gyűjtemény
 Name[id]=Koleksi Mass Storage Universal
 Name[is]=Universal Mass Storage safn
-Name[it]=Collezione universale di memorizzazione di massa
+Name[it]=Collezione archiviazione universale di massa (UMS)
 Name[ja]=Universal Mass Storage コレクション
 Name[km]=សម្រាំង​ឧបករណ៍​​ផ្ទុក​សកល
 Name[ko]=UMS 모음집