From 868d8108ac68b6a9f65e9ca6e288362f9b849aee Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 3 Apr 2021 01:13:00 +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"
---
 neochat.notifyrc        | 1 +
 org.kde.neochat.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index d0679ea66..af9938e36 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -9,6 +9,7 @@ Name[de]=NeoChat
 Name[es]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat
+Name[it]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pt]=NeoChat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 75d1da40a..e6b420b83 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -8,6 +8,7 @@ Name[de]=NeoChat
 Name[es]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat
+Name[it]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pt]=NeoChat