From 133edc249fa5171be4b76c71f8c1fccb2706587f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 29 Nov 2024 03:11:59 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop index 2b4f4d09a..0a149e9e4 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -88,6 +88,7 @@ GenericName[x-test]=xxMatrix Clientxx GenericName[zh_CN]=Matrix 客户端 GenericName[zh_TW]=Matrix 用戶端 Comment=Chat on Matrix +Comment[ar]=دردش على ماتركس Comment[ca]=Xat a Matrix Comment[ca@valencia]=Xat a Matrix Comment[de]=Über Matrix unterhalten