From babc87d023c6b580a7d728830285e5cea21f6d53 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 29 Nov 2021 01:35:58 +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 56dea2037..b0fd4699f 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -133,6 +133,7 @@ Name[fr]=Nouvelle invitation Name[ia]=Nove invitation Name[ko]=새 초대장 Name[nl]=Nieuwe uitnodiging +Name[pl]=Nowe zaproszenie Name[pt]=Novo Convite Name[pt_BR]=Novo convite Name[sl]=Novo povabilo @@ -148,6 +149,7 @@ Comment[fr]=Il y a une nouvelle invitation dans un salon. Comment[ia]=Il ha un nove invitation a un sala Comment[ko]=새로운 대화방 초대장을 받음 Comment[nl]=Er is een nieuwe uitnodiging naar een room +Comment[pl]=Dostępna jest nowe zaproszenie do pokoju Comment[pt]=Existe um novo convite para uma sala Comment[pt_BR]=Existe um novo convite para uma sala Comment[sl]=Tam je novo povabilo v sobo