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"

agents/archivemailagent/akonadi_archivemail_agent.notifyrc

@@ -203,7 +203,7 @@ Name[gl]=O directorio non existe
 Name[hu]=A könyvtár nem létezik
 Name[ia]=Le directorio non existe
 Name[it]=La cartella non esiste
-Name[ko]=디렉터리 서비스가 존재하지 않음
+Name[ko]=디렉터리가 없음
 Name[nb]=Mappa finnes ikke
 Name[nds]=Gifft Orner nich
 Name[nl]=Map bestaat niet