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-05-03 05:51:06 +02:00
parent ecacb0eb80
commit 6c6cd751ba
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fileitemactionplugin/kdeconnectsendfile.desktop
View file

@ -8,6 +8,7 @@ Name[es]=Enviar archivo a través del servicio KDE Connect
Name[fi]=Lähetä tiedosto KDE Connect -palvelulla
Name[fr]=Envoyer un fichier via le service KDE Connect
Name[gl]=Enviar o ficheiro mediante o servizo de KDE Connect
Name[it]=Invia il file tramite il servizio KDE Connect
Name[nl]=Bestand via KDE Connect-service versturen
Name[nn]=Send fil med KDE Connect-tenesta
Name[pt]=Enviar o ficheiro pelo serviço do KDE Connect

1
urlhandler/org.kde.kdeconnect.smshandler.desktop
View file

@ -5,6 +5,7 @@ Name[ca@valencia]=Gestor d'URL de SMS del KDE Connect
Name[en_GB]=KDE Connect SMS URL Handler
Name[es]=Controlador de URL de SMS de KDE Connect
Name[gl]=Xestor de URL de SMS de KDE Connect
Name[it]=Gestore URL SMS di KDE Connect
Name[nl]=URL behandelaar van KDE-Connect-SMS
Name[nn]=SMS-URL-handsamar for KDE Connect
Name[pt]=Tratamento de URL's de SMS do KDE Connect