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-02-17 09:39:32 +01:00
parent 91982e3099
commit 49ac81c4b7
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

@ -16,6 +16,7 @@
"Description[ko]": "KDE Connect로 다른 장치에 파일 보내기", "Description[ko]": "KDE Connect로 다른 장치에 파일 보내기",
"Description[lt]": "Siųsti failą į kitą įrenginį naudojant KDE Connect", "Description[lt]": "Siųsti failą į kitą įrenginį naudojant KDE Connect",
"Description[nl]": "Bestand naar ander apparaat versturen met KDE Connect", "Description[nl]": "Bestand naar ander apparaat versturen met KDE Connect",
"Description[nn]": "Send fil til anna eining via KDE Connect",
"Description[pt]": "Envia o ficheiro para outro dispositivo através do 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[pt_BR]": "Envia o arquivo para outro dispositivo usando o KDE Connect",
"Description[sk]": "Poslať súbor na iné zariadenie cez KDE Connect", "Description[sk]": "Poslať súbor na iné zariadenie cez KDE Connect",
@ -43,6 +44,7 @@
"Name[ko]": "KDE Connect로 파일 보내기", "Name[ko]": "KDE Connect로 파일 보내기",
"Name[lt]": "Siųsti failą per KDE Connect", "Name[lt]": "Siųsti failą per KDE Connect",
"Name[nl]": "Bestand via KDE Connect versturen", "Name[nl]": "Bestand via KDE Connect versturen",
"Name[nn]": "Send fil via KDE Connect",
"Name[pt]": "Enviar o ficheiro pelo KDE Connect", "Name[pt]": "Enviar o ficheiro pelo KDE Connect",
"Name[pt_BR]": "Enviar arquivo via KDE Connect", "Name[pt_BR]": "Enviar arquivo via KDE Connect",
"Name[sk]": "Poslať súbor cez KDE Connect", "Name[sk]": "Poslať súbor cez KDE Connect",