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-11 05:57:21 +02:00
parent a1ebbdfc09
commit 4372678c1f

View file

@ -18,6 +18,7 @@ Name[ko]=KDE Connect URL 처리기
Name[lt]=KDE Connect URL doroklė Name[lt]=KDE Connect URL doroklė
Name[nl]=URL behandelaar van KDE-Connect Name[nl]=URL behandelaar van KDE-Connect
Name[nn]=KDE Connect adressehandsamar 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]=Tratamento de URL's do KDE Connect
Name[pt_BR]=Tratamento de URLs do KDE Connect Name[pt_BR]=Tratamento de URLs do KDE Connect
Name[ro]=Manipulant de URL KDE Connect Name[ro]=Manipulant de URL KDE Connect