From 73745f2f5383158468c383e34a8e29c70050f0e6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 2 Apr 2019 06:00:53 +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 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index 04b22e801..10ddc25a2 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -105,10 +105,18 @@ Action=Popup
 
 [Event/remove-done]
 Name=Removed successfully
+Name[ca]=S'ha eliminat amb èxit
+Name[nl]=Met succes verwijderd
+Name[uk]=Успішно вилучено
+Name[x-test]=xxRemoved successfullyxx
 Action=Popup
 
 [Event/remove-fail]
 Name=Failed to remove
+Name[ca]=Ha fallat en eliminar
+Name[nl]=Verwijderen is mislukt
+Name[uk]=Не вдалося вилучити
+Name[x-test]=xxFailed to removexx
 Action=Popup
 
 [Event/switch-layout]