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-10-10 09:45:12 +02:00
parent a5507c1501
commit fc4d868014

View file

@ -16,6 +16,7 @@ Name[it]=Gestore URL di KDE Connect
Name[ko]=KDE Connect URL
Name[nl]=URL behandelaar van KDE-Connect
Name[nn]=KDE Connect adressehandsamar
Name[pl]=Obsługa adresów URL dla KDE Connect
Name[pt]=Tratamento de URL's do KDE Connect
Name[pt_BR]=Tratamento de URLs do KDE Connect
Name[ro]=Manipulant de URL KDE Connect