From f9b5aa328ae16563a68bb13a89b6e4db39436014 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 Nov 2021 01:29:26 +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" --- neochat.notifyrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neochat.notifyrc b/neochat.notifyrc index c803aef13..24c293537 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -131,6 +131,7 @@ Name[es]=Nueva invitación Name[fr]=Nouvelle invitation Name[ia]=Nove invitation Name[nl]=Nieuwe uitnodiging +Name[pt]=Novo Convite Name[sl]=Novo povabilo Name[sv]=Ny inbjudan Name[uk]=Нове запрошення @@ -142,6 +143,7 @@ Comment[es]=Hay una nueva invitación a una sala Comment[fr]=Il y a une nouvelle invitation dans un salon. Comment[ia]=Il ha un nove invitation a un sala Comment[nl]=Er is een nieuwe uitnodiging naar een room +Comment[pt]=Existe um novo convite para uma sala Comment[sl]=Tam je novo povabilo v sobo Comment[sv]=Det finns en ny inbjudan till ett rum Comment[uk]=У кімнаті нове запрошення