From ec3ded5abf8e9b31c82214511de1301e6270fe5c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 17 Dec 2016 05:47:06 +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" --- plugins/remotecommands/kdeconnect_remotecommands.json | 1 + plugins/telephony/kdeconnect_telephony.json | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index 2fb4f66cd..9a9cb57ee 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -42,6 +42,7 @@ "Name[da]": "Vært for eksterne kommandoer", "Name[el]": "Απομακρυσμένη εκτέλεση εντολών", "Name[es]": "Órdenes en servidor remoto", + "Name[et]": "Kaugkäsud", "Name[fi]": "Etäkomennot", "Name[it]": "Comandi remoti host", "Name[nl]": "Host voor commando's op afstand", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index e0ba321ea..6421afd04 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -17,6 +17,7 @@ "Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen", "Description[el]": "Εμφάνιση ειδοποιήσεων για κλήσεις και SMS", "Description[es]": "Mostrar notificaciones de llamadas y SMS", + "Description[et]": "Kõnede ja SMS-ide märguannete näitamine", "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset", "Description[it]": "Mostra notifiche per le chiamate e per gli SMS", "Description[nl]": "Meldingen tonen van oproepen en SMSjes",