From be740678855fa6b8891d6f5f66d673f51264c488 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 17 Nov 2019 08:46:15 +0100 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 | 1 + plugins/telephony/kdeconnect_telephony.json | 1 + 2 files changed, 2 insertions(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index 13e4a8fd6..2cd8772f8 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -8,6 +8,7 @@ Name[da]=Send fil via KDE Connect-tjeneste 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[eu]=Bidali fitxategia KDE Connect zerbitzuaren bidez Name[fi]=Lähetä tiedosto KDE Connect -palvelulla Name[fr]=Envoyer un fichier via le service KDE Connect Name[gl]=Enviar o ficheiro polo servizo de KDE Connect diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 25a6b9c51..4a0b4dc95 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -48,6 +48,7 @@ "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[eu]": "Erakutsi deien eta SMS mezuen jakinarazpenak", "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.",