From 83eaf6a9325a0e983d32a983466777470939d0fe Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 27 Sep 2016 10:24:42 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 843339244..c85c1b86e 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -9,6 +9,7 @@ } ], "Description": "Show notifications for calls and SMS", + "Description[ca@valencia]": "Mostra les notificacions de les trucades i els 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",