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-12-18 10:00:22 +01:00
parent fce8bc1e53
commit 3c810530e7

View file

@ -24,6 +24,7 @@ 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
Name[sk]=Obslužný program URL KDE Connect
Name[sl]=Upravitelj naslovov KDE Connect Name[sl]=Upravitelj naslovov KDE Connect
Name[sv]=KDE-anslut webbadresshanterare Name[sv]=KDE-anslut webbadresshanterare
Name[uk]=Обробник адрес KDE Connect Name[uk]=Обробник адрес KDE Connect