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/scripts/middleclickloader/metadata.desktop

@@ -17,7 +17,7 @@ Name[gl]=MiddleClickLoader
 Name[ia]=MiddleClickLoader
 Name[id]=MiddleClickLoader
 Name[it]=Caricatore al clic centrale
-Name[ko]=가운데 단추 누름 로더
+Name[ko]=가운데 단추 클릭 로더
 Name[lt]=Įkėlimas viduriniojo mygtuko spustelėjimu
 Name[nl]=MiddleClickLoader
 Name[nn]=Lasting med midtklikk