From 179139c623dc2e6731bb12d32fe12f8837a9d416 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 16 May 2021 01:22:09 +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        | 4 ++++
 org.kde.neochat.desktop | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 4cbe7bc31..0e3b6eeb1 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -18,6 +18,7 @@ Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
+Name[ro]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
@@ -43,6 +44,7 @@ Comment[pa]=ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪ
 Comment[pl]=Program do obsługi matriksa, rozproszonego protokołu porozumiewania się
 Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicações
 Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado
+Comment[ro]=Client pentru Matrix, protocolul de comunicare descentralizată
 Comment[sk]=Klient pre matrix, decentralizovaný komunikačný protokol
 Comment[sl]=Odjemalec za decentralizirani komunikacijski protokol matrix
 Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet
@@ -72,6 +74,7 @@ Name[pa]=ਨਵਾਂ ਸੁਨੇਹਾ
 Name[pl]=Nowa wiadomość
 Name[pt]=Nova mensagem
 Name[pt_BR]=Nova mensagem
+Name[ro]=Mesaj nou
 Name[sk]=Nová správa
 Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
@@ -98,6 +101,7 @@ Comment[pa]=ਨਵਾਂ ਸੁਨੇਹਾ ਹੈ
 Comment[pl]=Dostępna jest nowa wiadomość
 Comment[pt]=Tem uma mensagem nova
 Comment[pt_BR]=Existe uma nova mensagem
+Comment[ro]=Este un mesaj nou
 Comment[sk]=Je nová správa
 Comment[sl]=Prišlo je novo sporočilo
 Comment[sv]=Det finns ett nytt meddelande
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index fb5fa0e18..1f93ddf18 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -17,6 +17,7 @@ Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
+Name[ro]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
@@ -42,6 +43,7 @@ GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ
 GenericName[pl]=Program Matriksa
 GenericName[pt]=Cliente de Matrix
 GenericName[pt_BR]=Cliente Matrix
+GenericName[ro]=Client Matrix
 GenericName[sk]=Matrix Client
 GenericName[sl]=Odjemalec Matrix
 GenericName[sv]=Matrix-klient
@@ -68,6 +70,7 @@ Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈ
 Comment[pl]=Program obsługi protokołu Matriksa
 Comment[pt]=Cliente para o protocolo Matrix
 Comment[pt_BR]=Cliente para o protocolo Matrix
+Comment[ro]=Client pentru protocolul Matrix
 Comment[sk]=Klient protokolu Matrix
 Comment[sl]=Odjemalec za protokol Matrix
 Comment[sv]=Klient för protokollet Matrix