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-04-01 08:54:49 +02:00
parent b72a3e53f6
commit 6ecad4d8b8
3 changed files with 4 additions and 0 deletions

View file

@ -9,6 +9,7 @@ Name[gl]=Enviar o ficheiro mediante o servizo de KDE Connect
Name[it]=Invia il file tramite il servizio KDE Connect
Name[nl]=Bestand via KDE Connect-service versturen
Name[nn]=Send fil med KDE Connect-tenesta
Name[pt_BR]=Enviar arquivo pelo serviço KDE Connect
Name[sv]=Skicka via tjänsten KDE-anslut
Name[uk]=Надсилання файла за допомогою служби зєднання KDE
Name[x-test]=xxSend file via KDE Connect servicexx
@ -38,6 +39,7 @@ X-KDE-Submenu[ko]=연결
X-KDE-Submenu[nl]=Verbinden
X-KDE-Submenu[nn]=Kopla til
X-KDE-Submenu[pl]=Połącz
X-KDE-Submenu[pt_BR]=Conectar
X-KDE-Submenu[ru]=KDE Connect
X-KDE-Submenu[sk]=Pripojiť
X-KDE-Submenu[sv]=Anslut

View file

@ -89,6 +89,7 @@
"Name[nl]": "Stuur meldingen",
"Name[nn]": "Send varslingar",
"Name[pl]": "Wysyłaj powiadomienia",
"Name[pt_BR]": "Enviar notificações",
"Name[ru]": "Отправка уведомлений",
"Name[sk]": "Posielať upozornenia",
"Name[sv]": "Skicka underrättelser",

View file

@ -49,6 +49,7 @@
"Description[it]": "Mostra notifiche per chiamate ed SMS",
"Description[nl]": "Meldingen tonen van oproepen en SMSjes",
"Description[nn]": "Vis varslingar for oppringingar og SMS",
"Description[pt_BR]": "Mostra notificações para chamadas e SMS",
"Description[sr@ijekavian]": "Приказује обавештења за позиве и СМС",
"Description[sr@ijekavianlatin]": "Prikazuje obaveštenja za pozive i SMS",
"Description[sr@latin]": "Prikazuje obaveštenja za pozive i SMS",