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-25 08:42:30 +02:00
parent c2a663691b
commit 7779292a82
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

@ -4,6 +4,7 @@ Name=Send file via KDE Connect service
Name[ca]=Envia el fitxer a través del servei KDE Connect
Name[ca@valencia]=Envia el fitxer a través del servei KDE Connect
Name[cs]=Poslat soubor přes službu KDE Connect
Name[de]=Datei mit KDE-Connect -Dienst versenden
Name[en_GB]=Send file via KDE Connect service
Name[es]=Enviar archivo a través del servicio KDE Connect
Name[fi]=Lähetä tiedosto KDE Connect -palvelulla

1
plugins/telephony/kdeconnect_telephony.json
View file

@ -44,6 +44,7 @@
"Description[ca@valencia]": "Mostra les notificacions de les trucades i els SMS",
"Description[ca]": "Mostra les notificacions de les trucades i els SMS",
"Description[cs]": "Zobrazit upozornění pro telefonáty a SMS",
"Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen",
"Description[en_GB]": "Show notifications for calls and SMS",
"Description[es]": "Mostrar notificaciones para llamadas y SMS",
"Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset",