From 5df0923b22660305733ba78b589fc954183b76e4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 22 Feb 2016 10:51:54 +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/kdeconnect.notifyrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 42b4489b5..8f20f4373 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -103,6 +103,7 @@ Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[ca@valencia]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[de]=Verbindungsanfrage von einem Gerät erhalten
 Comment[el]=Λήφθηκε αίτημα σύζευξης από μια συσκευή
+Comment[en_GB]=Pairing request received from a device
 Comment[es]=Petición de vinculación recibida desde un dispositivo
 Comment[fi]=Saatiin paripyyntö laitteelta
 Comment[gl]=Recibiuse unha solicitude de emparellamento dun dispositivo.