From c8de0f88d3ef4b4c75b3318a71fbaa769c4ac78e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 2 May 2026 03:17: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"
---
 krfb/krfb.notifyrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/krfb/krfb.notifyrc b/krfb/krfb.notifyrc
index f0ff5aa0..13a5f02b 100644
--- a/krfb/krfb.notifyrc
+++ b/krfb/krfb.notifyrc
@@ -379,7 +379,7 @@ Name[ka]=კავშირი დაიხურა
 Name[kk]=Қосылымдан жабылды
 Name[km]=បាន​បិទ​ការ​ត​ភ្ជាប់
 Name[ko]=연결이 닫힘
-Name[lt]=Ryšys baigtas
+Name[lt]=Ryšys nutrauktas
 Name[lv]=Savienojums ir slēgts
 Name[mai]=संबंधन बन्न भ' गेल
 Name[ml]=ബന്ധം അടച്ചു
@@ -447,7 +447,7 @@ Comment[ka]=კავშირი დახურულია
 Comment[kk]=Қосылым жабылды
 Comment[km]=បាន​បិទ​ការ​ត​ភ្ជាប់
 Comment[ko]=연결이 닫힘
-Comment[lt]=Ryšys baigtas
+Comment[lt]=Ryšys nutrauktas
 Comment[lv]=Savienojums ir slēgts
 Comment[mk]=Поврзувањето е затворено
 Comment[ml]=ബന്ധം അടച്ചു