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"

runners/baloo/plasma-runner-baloosearch.desktop

@@ -53,7 +53,6 @@ Comment[en_GB]=Searches through files, emails and contacts
 Comment[es]=Busca en archivos, correo electrónico y contactos
 Comment[fi]=Etsii tiedostoista, sähköposteista ja yhteystiedoista
 Comment[gl]=Busca nos ficheiros, correos e contactos.
-Comment[is]=Leitar í skrám, tölvupósti og tengiliðum
 Comment[it]=Cerca tra file, messaggi di posta e contatti
 Comment[nl]=Doorzoekt bestanden, e-mailberichten en contactpersonen
 Comment[nn]=Søk gjennom filer, e-postar og kontaktar