From ec73a531014d36f2786fa4d6531cd96cf6332ec7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 31 May 2024 01:19: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/neochat.notifyrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc index 42952d4ab..c78032cee 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -253,6 +253,7 @@ Action=Popup [Event/Share] Name=Share +Name[ar]=شارك Name[ca]=Compartició Name[ca@valencia]=Compartició Name[cs]=Sdílet @@ -275,6 +276,7 @@ Name[uk]=Оприлюднення Name[x-test]=xxSharexx Name[zh_TW]=分享 Comment=The result of sharing a piece of content +Comment[ar]=نتيجة مشاركة محتوى Comment[ca]=El resultat de compartir una peça de contingut Comment[ca@valencia]=El resultat de compartir una peça de contingut Comment[en_GB]=The result of sharing a piece of content