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-08-30 05:15:25 +02:00
parent 9c91042441
commit 542e503bbc

View file

@ -18,7 +18,7 @@ Name[gl]=Enviar por KDE Connect
Name[it]=Invia tramite KDE Connect
Name[ko]=KDE Connect
Name[lt]=Siųsti per KDE Connect
Name[nl]=Via KDE Connect versturen
Name[nl]=Via KDE Connect verzenden
Name[nn]=Send via KDE Connect
Name[pl]=Wyślij przez KDE Connect
Name[pt]=Enviar pelo KDE Connect