From 7de69a1a271931ea63dac26485e5cc19c40b22bb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 4 Apr 2019 09:01:28 +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" --- plugins/telephony/kdeconnect_telephony.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index f8baa8f9b..d86ad1306 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[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.", "Description[it]": "Mostra notifiche per chiamate ed SMS",