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-21 08:51:08 +02:00
parent bc7de626b6
commit 41ef07492d
2 changed files with 2 additions and 0 deletions

View file

@ -14,6 +14,7 @@ Name[it]=Invia il file tramite il servizio KDE Connect
Name[ko]=KDE Connect Name[ko]=KDE Connect
Name[nl]=Bestand via KDE Connect-service versturen Name[nl]=Bestand via KDE Connect-service versturen
Name[nn]=Send fil med KDE Connect-tenesta 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ços KDE Connect Name[pt]=Enviar o ficheiro pelo serviços KDE Connect
Name[pt_BR]=Enviar arquivo pelo serviço KDE Connect Name[pt_BR]=Enviar arquivo pelo serviço KDE Connect
Name[sk]=Poslať súbor cez službu KDE Connect Name[sk]=Poslať súbor cez službu KDE Connect

View file

@ -55,6 +55,7 @@
"Description[ko]": "통화와 SMS 알림 표시", "Description[ko]": "통화와 SMS 알림 표시",
"Description[nl]": "Meldingen tonen van oproepen en SMSjes", "Description[nl]": "Meldingen tonen van oproepen en SMSjes",
"Description[nn]": "Vis varslingar for oppringingar og SMS", "Description[nn]": "Vis varslingar for oppringingar og SMS",
"Description[pl]": "Powiadamiaj o dzwonieniu i esemesach",
"Description[pt]": "Mostrar notificações para as chamadas e SMS", "Description[pt]": "Mostrar notificações para as chamadas e SMS",
"Description[pt_BR]": "Mostra notificações para chamadas e SMS", "Description[pt_BR]": "Mostra notificações para chamadas e SMS",
"Description[sk]": "Zobraziť oznámenia pre hovory a SMS", "Description[sk]": "Zobraziť oznámenia pre hovory a SMS",