From 00ce6be66e09f702641cb085e52df0addfc186db Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 28 Dec 2024 01:31: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           | 2 +-
 src/plasma-runner-neochat.desktop | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 9912751b2..257743c16 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -115,7 +115,7 @@ Comment[sa]=Matrix इत्यत्र गपशपं कुर्वन्
 Comment[sl]=Klepet na Matrixu
 Comment[sv]=Chatta på Matrix
 Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவும்
-Comment[tr]=Matrix Üzerinde Sohbet Et
+Comment[tr]=Matrix üzerinde sohbet edin
 Comment[uk]=Спілкування у Matrix
 Comment[x-test]=xxChat on Matrixxx
 Comment[zh_TW]=在 Matrix 上聊天
diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop
index 6c72269eb..96852bb22 100644
--- a/src/plasma-runner-neochat.desktop
+++ b/src/plasma-runner-neochat.desktop
@@ -81,7 +81,7 @@ Comment[sa]=NeoChat इत्यत्र कक्ष्याः अन्व
 Comment[sl]=Najdi sobe v NeoChatu
 Comment[sv]=Sök efter rum i NeoChat
 Comment[ta]=நியோச்சாட்டில் அரங்குகளை கண்டுபிடிக்கும்
-Comment[tr]=NeoChat'te odalar bulun
+Comment[tr]=NeoChat’te odalar bulun
 Comment[uk]=Пошук кімнат у NeoChat
 Comment[x-test]=xxFind rooms in NeoChatxx
 Comment[zh_CN]=在 NeoChat 查找聊天室