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-12-19 09:35:47 +01:00
parent a94a605741
commit 679622ff55
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fileitemactionplugin/kdeconnectsendfile.json
View file

@ -14,6 +14,7 @@
"Description[nl]": "Bestand naar ander apparaat versturen met KDE Connect",
"Description[pt]": "Envia o ficheiro para outro dispositivo através do KDE Connect",
"Description[pt_BR]": "Envia o arquivo para outro dispositivo usando o KDE Connect",
"Description[sk]": "Poslať súbor na iné zariadenie cez KDE Connect",
"Description[sv]": "Skicka fil till en annan enhet med användning av KDE:s anslutningstjänst",
"Description[uk]": "Надіслати файл на інший пристрій за допомогою KDE Connect",
"Description[x-test]": "xxSend file to other device using KDE Connectxx",
@ -36,6 +37,7 @@
"Name[nl]": "Bestand via KDE Connect versturen",
"Name[pt]": "Enviar o ficheiro pelo KDE Connect",
"Name[pt_BR]": "Enviar arquivo via KDE Connect",
"Name[sk]": "Poslať súbor cez KDE Connect",
"Name[sv]": "Skicka fil via KDE:s anslutningstjänst",
"Name[uk]": "Надіслати файл за допомогою KDE Connect",
"Name[x-test]": "xxSend file via KDE Connectxx",