From bfb96b0f67dcc62c07815b538274acd0394a1f5c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 7 Apr 2019 05:39:31 +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"
---
 app/lattedock.notifyrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index ab484caa7..166f0ed69 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -111,6 +111,7 @@ Action=Popup
 Name=Removed successfully
 Name[ca]=S'ha eliminat amb èxit
 Name[ca@valencia]=S'ha eliminat amb èxit
+Name[en_GB]=Removed successfully
 Name[gl]=Retirouse correctamente
 Name[it]=Rimossa con successo
 Name[nl]=Met succes verwijderd
@@ -123,6 +124,7 @@ Action=Popup
 Name=Failed to remove
 Name[ca]=Ha fallat en eliminar
 Name[ca@valencia]=Ha fallat en eliminar
+Name[en_GB]=Failed to remove
 Name[gl]=Non se puido retirar
 Name[it]=Impossibile rimuovere
 Name[nl]=Verwijderen is mislukt