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-11-28 05:47:09 +01:00
parent 83df9f1f47
commit 447158038d
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

@ -4,6 +4,7 @@
"Description": "Send file to other device using KDE Connect",
"Description[ca]": "Envia fitxers a un altre dispositiu mitjançant el KDE Connect",
"Description[gl]": "Enviar o ficheiro a outro dispositivo usando KDE Connect",
"Description[it]": "Invia file a un altro dispositivo utilizzando KDE Connect",
"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",
@ -18,6 +19,7 @@
"Name": "Send file via KDE Connect",
"Name[ca]": "Envia el fitxer a través del KDE Connect",
"Name[gl]": "Enviar o ficheiro por KDE Connect",
"Name[it]": "Invia file tramite KDE Connect",
"Name[nl]": "Bestand via KDE Connect versturen",
"Name[pt]": "Enviar o ficheiro pelo KDE Connect",
"Name[pt_BR]": "Enviar arquivo via KDE Connect",