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-08-04 08:42:55 +02:00
parent c52ee5f316
commit 6ae10c5d92
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fileitemactionplugin/kdeconnectsendfile.desktop
View file

@ -10,7 +10,7 @@ Name[en_GB]=Send file via KDE Connect service
Name[es]=Enviar archivo a través del servicio KDE Connect Name[es]=Enviar archivo a través del servicio KDE Connect
Name[fi]=Lähetä tiedosto KDE Connect -palvelulla Name[fi]=Lähetä tiedosto KDE Connect -palvelulla
Name[fr]=Envoyer un fichier via le service KDE Connect Name[fr]=Envoyer un fichier via le service KDE Connect
Name[gl]=Enviar o ficheiro mediante o servizo de KDE Connect Name[gl]=Enviar o ficheiro polo servizo de KDE Connect
Name[it]=Invia il file tramite il servizio KDE Connect Name[it]=Invia il file tramite il servizio KDE Connect
Name[ko]=KDE Connect 서비스로 파일 보내기 Name[ko]=KDE Connect 서비스로 파일 보내기
Name[nl]=Bestand via KDE Connect-service versturen Name[nl]=Bestand via KDE Connect-service versturen