From 8dd4f04f976292b56bd165a1f22992523ee43063 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 26 Sep 2016 09:25:33 +0000 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index a384ed72c..843339244 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -9,6 +9,13 @@ } ], "Description": "Show notifications for calls and SMS", + "Description[ca]": "Mostra les notificacions de les trucades i els SMS", + "Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen", + "Description[nl]": "Meldingen tonen van oproepen en SMSjes", + "Description[pt]": "Mostrar notificações para as chamadas e SMS", + "Description[sv]": "Visa underrättelser om samtal och SMS", + "Description[uk]": "Показ сповіщень щодо дзвінків і SMS", + "Description[x-test]": "xxShow notifications for calls and SMSxx", "EnabledByDefault": true, "Icon": "call-start", "Id": "kdeconnect_telephony",