From bd034b4dfae8e62c9304d04740982eefe6c1a88e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 12 Feb 2021 08:19:23 +0100
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"
---
 dataengines/devicenotifications/devicenotifications.notifyrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dataengines/devicenotifications/devicenotifications.notifyrc b/dataengines/devicenotifications/devicenotifications.notifyrc
index 027ae2736..4bc8be36a 100644
--- a/dataengines/devicenotifications/devicenotifications.notifyrc
+++ b/dataengines/devicenotifications/devicenotifications.notifyrc
@@ -47,6 +47,7 @@ Name[lv]=Ierīču paziņotājs
 Name[mk]=Известувач за уреди
 Name[ml]=ഡിവൈസ് നോട്ടിഫയര്‍
 Name[mr]=साधन निदर्शक
+Name[nb]=Enhetsvarsler
 Name[nds]=Bescheden över Reedschappen
 Name[nl]=Apparaatmelder
 Name[nn]=Einingsvarslar