From 3b9337d2a8bd09d0988179be9c6bb761e98f6954 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 16 Jan 2024 01:12:42 +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           | 2 +-
 src/neochat.notifyrc              | 2 ++
 src/plasma-runner-neochat.desktop | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 2842e5a7a..f8b07711d 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -65,7 +65,7 @@ GenericName[ie]=Cliente de Matrix
 GenericName[it]=Client Matrix
 GenericName[ka]=Matrix -ის კლიენტი
 GenericName[ko]=Matrix 클라이언트
-GenericName[lt]=Matrix kliento programą
+GenericName[lt]=Matrix kliento programa
 GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
 GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ
diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc
index fd9ce2e86..578c946d1 100644
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -188,6 +188,7 @@ Name[ie]=Nov invitation
 Name[it]=Nuovo invito
 Name[ka]=ახალი მოსაწვევი
 Name[ko]=새 초대장
+Name[lt]=Naujas pakvietimas
 Name[nl]=Nieuwe uitnodiging
 Name[nn]=Ny invitasjon
 Name[pa]=ਨਵਾਂ ਸੱਦਾ
@@ -225,6 +226,7 @@ Comment[ie]=Vu have un nov invitation a un chambre
 Comment[it]=È presente un nuovo invito a una stanza
 Comment[ka]=გაქვთ ახალი ოთახის მოსაწვევი
 Comment[ko]=새로운 대화방 초대장을 받음
+Comment[lt]=Yra naujas pakvietimas į kambarį
 Comment[nl]=Er is een nieuwe uitnodiging naar een room
 Comment[nn]=Du har ein ny invitasjon til eit rom
 Comment[pa]=ਰੂਮ ਲਈ ਨਵਾਂ ਸੱਦਾ ਹੈ
diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop
index b8ff1a353..9c3b03c33 100644
--- a/src/plasma-runner-neochat.desktop
+++ b/src/plasma-runner-neochat.desktop
@@ -63,6 +63,7 @@ Comment[ie]=Trovar chambres in NeoChat
 Comment[it]=Trova stanze in NeoChat
 Comment[ka]=იპოვე ოთახები NeoChat-ში
 Comment[ko]=NeoChat에서 대화방 찾기
+Comment[lt]=Rasti kambarius NeoChat
 Comment[nl]=Rooms zoeken in NeoChat
 Comment[nn]=Finn rom i NeoChat
 Comment[pl]=Znajdź pokoje w NeoChat