From 78a4ce1ce79a0e4e24528c2b7962d266862d91c2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 10 Aug 2025 01:34:43 +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 0b9eea89..f8e2d7e6 100644 --- a/krfb/krfb.notifyrc +++ b/krfb/krfb.notifyrc @@ -707,7 +707,7 @@ Name[zh_CN]=无效密码邀请 Name[zh_TW]=無效的密碼邀請 Comment=The invited party sent an invalid password. Connection refused. Comment[af]=Die uitgenooi party gestuur 'n ongeldige wagwoord. Verbinding geweier. -Comment[ar]=المدعو أرسل كلمة مرور غير صحيحة. رفض الإتصال. +Comment[ar]=المدعو أرسل كلمة سر غير صحيحة. رُفض الاتصال. Comment[bg]=Поканената страна изпрати неправилна парола. Връзката е отказана. Comment[bn]=আমন্ত্রিত দল একটি অবৈধ পাসওয়ার্ড পাঠাল। সংযোগ অস্বীকার করা হল। Comment[bs]=Pozvana strana je poslala pogrešnu šifru. Veza je odbijena. @@ -1114,7 +1114,7 @@ Name[zh_CN]=连接过多 Name[zh_TW]=太多連線 Comment=Busy, connection refused Comment[af]=Besig, verbinding geweier -Comment[ar]=مشغول، الإتصال رفض +Comment[ar]=مشغول، الاتصال رفض Comment[bg]=Заето. Връзката е отказана. Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার করল Comment[br]=Dalc'het, kevreadenn disteuleret