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"

effects/thumbnailaside/thumbnailaside_config.desktop

@@ -35,7 +35,7 @@ Name[hne]=चिनहा बाजू में
 Name[hr]=Pokrajnja sličica
 Name[hu]=Ablakbetekintő oldalt
 Name[ia]=Miniatura a parte
-Name[id]=Gambar-mini Aside
+Name[id]=Thumbnail Aside
 Name[is]=Smámynd til hliðar
 Name[it]=Miniature a fianco
 Name[ja]=サムネイルをわきに表示