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-04-01 06:36:16 +02:00
parent e48e34d776
commit e2d175f2a0

View file

@ -20,6 +20,7 @@ Name[hu]=Küldés a KDE Connecttel
Name[it]=Invia tramite KDE Connect Name[it]=Invia tramite KDE Connect
Name[ko]=KDE Connect Name[ko]=KDE Connect
Name[lt]=Siųsti per KDE Connect Name[lt]=Siųsti per KDE Connect
Name[ml]=.ി. ി
Name[nl]=Via KDE Connect verzenden Name[nl]=Via KDE Connect verzenden
Name[nn]=Send via KDE Connect Name[nn]=Send via KDE Connect
Name[pl]=Wyślij przez KDE Connect Name[pl]=Wyślij przez KDE Connect