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"
This commit is contained in:
l10n daemon script 2020-09-28 09:54:39 +02:00
parent e140dfd935
commit 3ece5162ba

View file

@ -6,6 +6,7 @@ Name[ca@valencia]=Gestor d'URL del KDE Connect
Name[cs]=Nástroj pro práci s URL v KDE Connect
Name[da]=URL-håndtering til KDE Connect
Name[de]=KDE Connect-SMS-Dienstprogramm für URLs (Adressen)
Name[en_GB]=KDE Connect URL Handler
Name[es]=Controlador de URL de KDE Connect
Name[eu]=KDE Connect-eko URL maneiatzailea
Name[fi]=KDE Connectin verkko-osoitekäsittelijä