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 2019-06-22 05:13:07 +02:00
parent f9dee192b5
commit 131b68579e

View file

@ -14,6 +14,7 @@ Name[it]=Invia il file tramite il servizio KDE Connect
Name[ko]=KDE Connect
Name[nl]=Bestand via KDE Connect-service versturen
Name[nn]=Send fil med KDE Connect-tenesta
Name[pl]=Wyślij plik przez usługę KDE Connect
Name[pt]=Enviar o ficheiro pelo serviço do KDE Connect
Name[pt_BR]=Enviar arquivo via serviço do KDE Connect
Name[sv]=Skicka fil via KDE:s anslutningstjänst