From 2fc026b60d45fda3be3dfcdb342c45ec6d246d56 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Apr 2019 08:42:38 +0200 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours 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" --- fileitemactionplugin/kdeconnectsendfile.desktop | 2 ++ plugins/sendnotifications/kdeconnect_sendnotifications.json | 2 ++ plugins/telephony/kdeconnect_telephony.json | 1 + 3 files changed, 5 insertions(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index c05aa1cef..436ccf789 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -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[en_GB]=Send file via KDE Connect service +Name[es]=Enviar archivo a través del servicio KDE Connect 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 @@ -27,6 +28,7 @@ X-KDE-Submenu[da]=Forbind X-KDE-Submenu[de]=Verbinden X-KDE-Submenu[el]=Σύνδεση X-KDE-Submenu[en_GB]=Connect +X-KDE-Submenu[es]=Connect X-KDE-Submenu[et]=Ühendus X-KDE-Submenu[eu]=Konektatu X-KDE-Submenu[fi]=Yhdistä diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index ded4ed3b0..437eb0f7b 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -48,6 +48,7 @@ "Description[de]": "Die Benachrichtigungen dieses Rechners aussenden, sodass sie auf anderen Geräten angezeigt werden können.", "Description[el]": "Μεταδώστε την ειδοποίηση αυτού του υπολογιστή, ώστε να εμφανιστεί σε άλλες συσκευές.", "Description[en_GB]": "Broadcast this computer's notifications, so they can be shown on other devices.", + "Description[es]": "Retransmitir las notificaciones de este equipo, de manera que se muestren en otros dispositivos.", "Description[et]": "Arvuti märguannete levitamine, et neid oleks näha ka teistes seadmetes", "Description[eu]": "Hedatu ordenagailu honen jakinarazpenak, beste gailuetan erakutsi ahal izateko", "Description[fi]": "Lähetä tämän tietokoneen ilmoitukset, jotta ne voidaan näyttää muilla laitteilla.", @@ -79,6 +80,7 @@ "Name[de]": "Benachrichtigungen senden", "Name[el]": "Αποστολή ειδοποιήσεων", "Name[en_GB]": "Send notifications", + "Name[es]": "Enviar notificaciones", "Name[et]": "Märguannete saatmine", "Name[eu]": "Bidali jakinarazpenak", "Name[fi]": "Lähetä ilmoituksia", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index d86ad1306..382bb16d5 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -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[en_GB]": "Show notifications for calls and SMS", + "Description[es]": "Mostrar notificaciones para llamadas y SMS", "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset", "Description[fr]": "Affichez les notifications pour les appels et les SMS", "Description[gl]": "Mostrar notificacións de chamadas e mensaxes SMS.",