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-02 05:30:09 +01:00
parent 646aecc47b
commit e11eca64af
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

@ -3,6 +3,7 @@
"Category": "Utilities",
"Description": "Send file to other device using KDE Connect",
"Description[ca]": "Envia fitxers a un altre dispositiu mitjançant el KDE Connect",
"Description[en_GB]": "Send file to other device using KDE Connect",
"Description[et]": "Faili saatmine teise seadmesse KDE Connecti kaudu",
"Description[gl]": "Enviar o ficheiro a outro dispositivo usando KDE Connect",
"Description[it]": "Invia file a un altro dispositivo utilizzando KDE Connect",
@ -21,6 +22,7 @@
],
"Name": "Send file via KDE Connect",
"Name[ca]": "Envia el fitxer a través del KDE Connect",
"Name[en_GB]": "Send file via KDE Connect",
"Name[et]": "Faili saatmine KDE Connecti kaudu",
"Name[gl]": "Enviar o ficheiro por KDE Connect",
"Name[it]": "Invia file tramite KDE Connect",