From 1cbb4a93eb5e409fbd36ef5df7817d391e08389d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 28 Feb 2024 01:13:32 +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 943d8db4b..664eabb28 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -248,6 +248,7 @@ Action=Popup Name=Share Name[ca]=Compartició Name[eo]=Kundividi +Name[es]=Compartir Name[eu]=Partekatu Name[ia]=Comparti Name[ka]=გაზიარება @@ -259,6 +260,7 @@ Name[x-test]=xxSharexx Comment=The result of sharing a piece of content Comment[ca]=El resultat de compartir una peça de contingut Comment[eo]=La rezulto el kundividado de enhavero +Comment[es]=El resultado de compartir una parte de contenido Comment[eu]=Eduki pieza bat partekatzearen emaitza Comment[ia]=Le exito de compartir un pecietta de contento Comment[ka]=შემცველობის ნაწილის გაზიარების შედეგი