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/data/org.kde.kmail2.desktop

@@ -251,7 +251,7 @@ Name[pl]=Sprawdź pocztę
 Name[pt]=Verificar o Correio
 Name[pt_BR]=Verificar e-mails
 Name[ru]=Проверить почту
-Name[sk]=S&kontrolovať poštu
+Name[sk]=Skontrolovať poštu
 Name[sl]=Preveri pošto
 Name[sr]=Провери пошту
 Name[sr@ijekavian]=Провери пошту