tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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-03 09:05:03 +02:00
parent 80183cda73
commit 6789967721
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fileitemactionplugin/kdeconnectsendfile.desktop
View file

@ -11,6 +11,7 @@ Name[nl]=Bestand via KDE Connect-service versturen
Name[nn]=Send fil med KDE Connect-tenesta
Name[pt]=Enviar o ficheiro pelo serviços KDE Connect
Name[pt_BR]=Enviar arquivo pelo serviço KDE Connect
Name[sk]=Poslať súbor cez službu KDE Connect
Name[sv]=Skicka via tjänsten KDE-anslut
Name[uk]=Надсилання файла за допомогою служби з’єднання KDE
Name[x-test]=xxSend file via KDE Connect servicexx

1
plugins/telephony/kdeconnect_telephony.json
View file

@ -51,6 +51,7 @@
"Description[nn]": "Vis varslingar for oppringingar og SMS",
"Description[pt]": "Mostrar notificações para as chamadas e SMS",
"Description[pt_BR]": "Mostra notificações para chamadas e SMS",
"Description[sk]": "Zobraziť oznámenia pre hovory a SMS",
"Description[sr@ijekavian]": "Приказује обавештења за позиве и СМС",
"Description[sr@ijekavianlatin]": "Prikazuje obaveštenja za pozive i SMS",
"Description[sr@latin]": "Prikazuje obaveštenja za pozive i SMS",