From 00f7dd517517a40defba1c05d6accb68ab237ba7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 Nov 2025 01:34:16 +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" --- src/app/neochat.notifyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/neochat.notifyrc b/src/app/neochat.notifyrc index 88ffd7383..5211535e9 100644 --- a/src/app/neochat.notifyrc +++ b/src/app/neochat.notifyrc @@ -259,7 +259,7 @@ Comment[sa]=कक्षस्य नूतनं निमन्त्रणम Comment[sl]=Tam je novo povabilo v sobo Comment[sv]=Det finns en ny inbjudan till ett rum Comment[ta]=ஓர் அரங்கிற்கான புதிய அழைப்பிதழ் உள்ளது -Comment[tr]=Bir odaya yeni bir davetiye var +Comment[tr]=Bir odaya yeni bir davet var Comment[uk]=У кімнаті нове запрошення Comment[zh_CN]=有新的聊天室邀请 Comment[zh_TW]=有新的加入聊天室邀請