From c4aa843038fbd4cae026d24b5b2b23ff00ae0101 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 15 Dec 2024 01:35:34 +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"
---
 org.kde.neochat.desktop           | 3 +++
 src/neochat.notifyrc              | 8 ++++++++
 src/plasma-runner-neochat.desktop | 2 ++
 src/purpose/purposeplugin.json    | 3 +++
 4 files changed, 16 insertions(+)

diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 3934dec4b..a167ee2ab 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -36,6 +36,7 @@ Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
 Name[ru]=NeoChat
+Name[sa]=नवचैट्
 Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
@@ -78,6 +79,7 @@ GenericName[pt]=Cliente de Matrix
 GenericName[pt_BR]=Cliente Matrix
 GenericName[ro]=Client Matrix
 GenericName[ru]=Клиент Matrix
+GenericName[sa]=मैट्रिक्स क्लाइंट
 GenericName[sk]=Matrix Client
 GenericName[sl]=Odjemalec Matrix
 GenericName[sv]=Matrix-klient
@@ -106,6 +108,7 @@ Comment[ka]=ჩატი Matrix-ზე
 Comment[lv]=Tērzējiet „Matrix“ tīklā
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie
+Comment[sa]=Matrix इत्यत्र गपशपं कुर्वन्तु
 Comment[sl]=Klepet na Matrixu
 Comment[sv]=Chatta på Matrix
 Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவும்
diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc
index 24fc38e8c..170b391fe 100644
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -34,6 +34,7 @@ Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
 Name[ru]=NeoChat
+Name[sa]=नवचैट्
 Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
@@ -77,6 +78,7 @@ Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicaç
 Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado
 Comment[ro]=Client pentru Matrix, protocolul de comunicare descentralizată
 Comment[ru]=Клиент для Matrix — децентрализованного коммуникационного протокола
+Comment[sa]=मैट्रिक्सस्य कृते एकः क्लायन्ट्, विकेन्द्रीकृतसञ्चारप्रोटोकॉलः
 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
@@ -122,6 +124,7 @@ Name[pt]=Nova mensagem
 Name[pt_BR]=Nova mensagem
 Name[ro]=Mesaj nou
 Name[ru]=Новое сообщение
+Name[sa]=नूतनः सन्देशः
 Name[sk]=Nová správa
 Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
@@ -163,6 +166,7 @@ Comment[pt]=Tem uma mensagem nova
 Comment[pt_BR]=Existe uma nova mensagem
 Comment[ro]=Este un mesaj nou
 Comment[ru]=Доступно новое сообщение
+Comment[sa]=तत्र नूतनः सन्देशः अस्ति
 Comment[sk]=Je nová správa
 Comment[sl]=Prišlo je novo sporočilo
 Comment[sv]=Det finns ett nytt meddelande
@@ -207,6 +211,7 @@ Name[pl]=Nowe zaproszenie
 Name[pt]=Novo Convite
 Name[pt_BR]=Novo convite
 Name[ru]=Новое приглашение
+Name[sa]=नवीन आमन्त्रणम्
 Name[sl]=Novo povabilo
 Name[sv]=Ny inbjudan
 Name[ta]=புதிய அழைப்பிதழ்
@@ -247,6 +252,7 @@ Comment[pl]=Dostępna jest nowe zaproszenie do pokoju
 Comment[pt]=Existe um novo convite para uma sala
 Comment[pt_BR]=Existe um novo convite para uma sala
 Comment[ru]=Доступно новое приглашение в комнату
+Comment[sa]=कक्षस्य नूतनं निमन्त्रणम् अस्ति
 Comment[sl]=Tam je novo povabilo v sobo
 Comment[sv]=Det finns en ny inbjudan till ett rum
 Comment[ta]=ஓர் அரங்கிற்கான புதிய அழைப்பிதழ் உள்ளது
@@ -283,6 +289,7 @@ Name[nn]=Del
 Name[pl]=Udostępnij
 Name[pt_BR]=Compartilhar
 Name[ru]=Публикация
+Name[sa]=संविभागः
 Name[sl]=Deli
 Name[sv]=Dela
 Name[ta]=பகிர்
@@ -314,6 +321,7 @@ Comment[nn]=Resultatet av deling av innhald
 Comment[pl]=Wynik udostępniania kawałka treści
 Comment[pt_BR]=O resultado de compartilhar um conteúdo
 Comment[ru]=Результат публикации данных
+Comment[sa]=सामग्रीखण्डस्य साझाकरणस्य परिणामः
 Comment[sl]=Rezultat deljenega kosa vsebine
 Comment[sv]=Resultatet av att dela innehåll
 Comment[ta]=எதையோ பகிர்ந்த‍தன் விளைவு
diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop
index fe8f2146f..520068cb1 100644
--- a/src/plasma-runner-neochat.desktop
+++ b/src/plasma-runner-neochat.desktop
@@ -35,6 +35,7 @@ Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
 Name[ru]=NeoChat
+Name[sa]=नवचैट्
 Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
@@ -74,6 +75,7 @@ Comment[pl]=Znajdź pokoje w NeoChat
 Comment[pt]=Procurar salas no NeoChat
 Comment[pt_BR]=Encontrar salas no NeoChat
 Comment[ru]=Поиск комнат NeoChat
+Comment[sa]=NeoChat इत्यत्र कक्ष्याः अन्वेषणं कुर्वन्तु
 Comment[sl]=Najdi sobe v NeoChatu
 Comment[sv]=Sök efter rum i NeoChat
 Comment[ta]=நியோச்சாட்டில் அரங்குகளை கண்டுபிடிக்கும்
diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json
index 4dff77adc..a228db533 100644
--- a/src/purpose/purposeplugin.json
+++ b/src/purpose/purposeplugin.json
@@ -26,6 +26,7 @@
                 "Name[nn]": "Tobias Fella",
                 "Name[pl]": "Tobias Fella",
                 "Name[ru]": "Tobias Fella",
+                "Name[sa]": "टोबियास फेला",
                 "Name[sk]": "Tobias Fella",
                 "Name[sl]": "Tobias Fella",
                 "Name[sv]": "Tobias Fella",
@@ -60,6 +61,7 @@
         "Description[nn]": "Del via NeoChat",
         "Description[pl]": "Udostępnij przez NeoChat",
         "Description[ru]": "Опубликовать в NeoChat",
+        "Description[sa]": "NeoChat मार्गेण साझां कुर्वन्तु",
         "Description[sl]": "Deli prek NeoChat",
         "Description[sv]": "Dela via NeoChat",
         "Description[ta]": "நியோச்சாட் மூலம் பகிர்",
@@ -94,6 +96,7 @@
         "Name[nn]": "NeoChat",
         "Name[pl]": "NeoChat",
         "Name[ru]": "NeoChat",
+        "Name[sa]": "नवचैट्",
         "Name[sk]": "NeoChat",
         "Name[sl]": "NeoChat",
         "Name[sv]": "NeoChat",