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-18 09:26:45 +01:00
parent 955ea4cc6a
commit a94a605741
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

@ -7,6 +7,7 @@
"Description[en_GB]": "Send file to other device using KDE Connect",
"Description[es]": "Enviar archivo a otro dispositivo usando KDE Connect",
"Description[et]": "Faili saatmine teise seadmesse KDE Connecti kaudu",
"Description[fr]": "Envoyer le fichier vers un autre appareil 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[lt]": "Siųsti failą į kitą įrenginį naudojant KDE Connect",
@ -28,6 +29,7 @@
"Name[en_GB]": "Send file via KDE Connect",
"Name[es]": "Enviar archivo con KDE Connect",
"Name[et]": "Faili saatmine KDE Connecti kaudu",
"Name[fr]": "Envoyer le fichier via KDE Connect",
"Name[gl]": "Enviar o ficheiro por KDE Connect",
"Name[it]": "Invia file tramite KDE Connect",
"Name[lt]": "Siųsti failą per KDE Connect",