From 761ec0f1cb5f29b8b97a8d2eae732aa346fbe092 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 1 Oct 2022 01:54:38 +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              | 6 ++++++
 src/plasma-runner-neochat.desktop | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index c2e2a2128..8380ed94a 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -18,6 +18,7 @@ Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
 Name[it]=NeoChat
+Name[ka]=NeoChat
 Name[ko]=NeoChat
 Name[lt]=NeoChat
 Name[nl]=NeoChat
@@ -51,6 +52,7 @@ GenericName[hu]=Matrix kliens
 GenericName[ia]=Cliente de Matrice
 GenericName[id]=Klien Matrix
 GenericName[it]=Client Matrix
+GenericName[ka]=Matrix -ის კლიენტი
 GenericName[ko]=Matrix 클라이언트
 GenericName[lt]=Matrix kliento programą
 GenericName[nl]=Matrix-client
@@ -83,6 +85,7 @@ Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[id]=Klien untuk protokol Matrix
 Comment[it]=Client per il protocollo Matrix
+Comment[ka]=კლიენტი Matrix-ის პროტოკოლისთვის
 Comment[ko]=Matrix 프로토콜용 클라이언트
 Comment[lt]=Matrix protokolo kliento programa
 Comment[nl]=Client voor het Matrix-protocol
diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc
index a7b428d0a..870c6060f 100644
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -16,6 +16,7 @@ Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
 Name[it]=NeoChat
+Name[ka]=NeoChat
 Name[ko]=NeoChat
 Name[lt]=NeoChat
 Name[nl]=NeoChat
@@ -50,6 +51,7 @@ Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz
 Comment[ia]=Un cliente per Matrix, le protocollo de communication decentralisate
 Comment[id]=Sebuah klien untuk matrix, protokol komunikasi terdecentralisasi
 Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato
+Comment[ka]=კლიენტი Matrix-სთვის, დეცენტრალიზებული კომუნიკაციის პროტოკოლისთვის
 Comment[ko]=Matrix, 분산 대화 프로토콜 클라이언트
 Comment[lt]=Matrix decentralizuoto bendravimo protokolo kliento programa
 Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol
@@ -85,6 +87,7 @@ Name[hu]=Új üzenet
 Name[ia]=Nove message
 Name[id]=Pesan baru
 Name[it]=Nuovo messaggio
+Name[ka]=ახალი შეტყობინება
 Name[ko]=새 메시지
 Name[lt]=Nauja žinutė
 Name[nl]=Nieuw bericht
@@ -117,6 +120,7 @@ Comment[hu]=Új üzenet érkezett
 Comment[ia]=Il ha un nove message
 Comment[id]=Ada pesan baru
 Comment[it]=È presente un nuovo messaggio
+Comment[ka]=გაქვთ ახალი შეტყობინება
 Comment[ko]=새 메시지가 있음
 Comment[lt]=Yra nauja žinutė
 Comment[nl]=Er is een nieuw bericht
@@ -152,6 +156,7 @@ Name[fr]=Nouvelle invitation
 Name[ia]=Nove invitation
 Name[id]=Undangan Baru
 Name[it]=Nuovo invito
+Name[ka]=ახალი მოსაწვევი
 Name[ko]=새 초대장
 Name[nl]=Nieuwe uitnodiging
 Name[pa]=ਨਵਾਂ ਸੱਦਾ
@@ -179,6 +184,7 @@ Comment[fr]=Il y a une nouvelle invitation dans un salon.
 Comment[ia]=Il ha un nove invitation a un sala
 Comment[id]=Ada undangan baru ke sebuah ruangan
 Comment[it]=È presente un nuovo invito a una stanza
+Comment[ka]=გაქვთ ახალი ოთახის მოსაწვევი
 Comment[ko]=새로운 대화방 초대장을 받음
 Comment[nl]=Er is een nieuwe uitnodiging naar een room
 Comment[pa]=ਰੂਮ ਲਈ ਨਵਾਂ ਸੱਦਾ ਹੈ
diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop
index 24dc0f4d6..334839e0f 100644
--- a/src/plasma-runner-neochat.desktop
+++ b/src/plasma-runner-neochat.desktop
@@ -17,6 +17,7 @@ Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
 Name[it]=NeoChat
+Name[ka]=NeoChat
 Name[ko]=NeoChat
 Name[lt]=NeoChat
 Name[nl]=NeoChat
@@ -47,6 +48,7 @@ Comment[fr]=Trouver des salons dans NeoChat
 Comment[ia]=Trova salas in NeoChat
 Comment[id]=Cari ruangan di NeoChat
 Comment[it]=Trova stanze in NeoChat
+Comment[ka]=იპოვე ოთახები NeoChat-ში
 Comment[ko]=NeoChat에서 대화방 찾기
 Comment[nl]=Rooms zoeken in NeoChat
 Comment[pl]=Znajdź pokoje w NeoChat