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 2020-01-28 05:43:32 +01:00
parent e0d5927bca
commit 6ea79997f6
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

@ -12,6 +12,7 @@
"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[ko]": "KDE Connect로 다른 장치에 파일 보내기",
"Description[lt]": "Siųsti failą į kitą įrenginį naudojant 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",
@ -38,6 +39,7 @@
"Name[fr]": "Envoyer le fichier via KDE Connect",
"Name[gl]": "Enviar o ficheiro por KDE Connect",
"Name[it]": "Invia file tramite KDE Connect",
"Name[ko]": "KDE Connect로 파일 보내기",
"Name[lt]": "Siųsti failą per KDE Connect",
"Name[nl]": "Bestand via KDE Connect versturen",
"Name[pt]": "Enviar o ficheiro pelo KDE Connect",