From 00d8fb75e3e8b627b4445bebadc4d0a929d2462f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 1 Jan 2022 01:42:37 +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 e8f5a0e3f..30633e2e0 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -135,6 +135,7 @@ Name[ia]=Nove invitation Name[it]=Nuovo invito Name[ko]=새 초대장 Name[nl]=Nieuwe uitnodiging +Name[pa]=ਨਵਾਂ ਸੱਦਾ Name[pl]=Nowe zaproszenie Name[pt]=Novo Convite Name[pt_BR]=Novo convite @@ -153,6 +154,7 @@ Comment[ia]=Il ha un nove invitation a un sala Comment[it]=È presente un nuovo invito a una stanza Comment[ko]=새로운 대화방 초대장을 받음 Comment[nl]=Er is een nieuwe uitnodiging naar een room +Comment[pa]=ਰੂਮ ਲਈ ਨਵਾਂ ਸੱਦਾ ਹੈ 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