From 969f3105efbb8e669cbb41947c74f144dc1cfbc9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 14 Sep 2018 05:48:01 +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/sms/kdeconnect_sms.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/sms/kdeconnect_sms.json b/plugins/sms/kdeconnect_sms.json
index 74350e3e0..1ba5e1500 100644
--- a/plugins/sms/kdeconnect_sms.json
+++ b/plugins/sms/kdeconnect_sms.json
@@ -8,6 +8,7 @@
             }
         ],
         "Description": "Send and receive SMS",
+        "Description[ca@valencia]": "Envia i rep SMS",
         "Description[ca]": "Envia i rep SMS",
         "Description[nl]": "SMS verzenden en ontvangen",
         "Description[pt]": "Enviar e receber SMS's",