From 759496620f2a52bcb19e83f4573fc10378d00f6a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 26 Jul 2021 02:17:04 +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 a12213ab4..86b4cffd6 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -18,6 +18,7 @@ Name[nn]=NeoChat
 Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
 Name[pt_BR]=NeoChat
+Name[ro]=NeoChat
 Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index e5cbc6573..8e0ca9918 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -17,6 +17,7 @@ Name[nn]=NeoChat
 Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
 Name[pt_BR]=NeoChat
+Name[ro]=NeoChat
 Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat