From 5990e00577eef4930fc1b9cbdabec3d297040c3b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 4 Aug 2024 01:20:55 +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 e569f6622..800be5514 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -271,6 +271,7 @@ Name[lv]=Kopīgot Name[nl]=Gedeelde Name[nn]=Del Name[pl]=Udostępnij +Name[pt_BR]=Compartilhar Name[sl]=Deli Name[sv]=Dela Name[ta]=பகிர் @@ -296,6 +297,7 @@ Comment[lv]=Satura kopīgošanas rezultāts Comment[nl]=Het resultaat van het delen van een stukje inhoud Comment[nn]=Resultatet av deling av innhald Comment[pl]=Wynik udostępniania kawałka treści +Comment[pt_BR]=O resultado de compartilhar um conteúdo Comment[sl]=Rezultat deljenega kosa vsebine Comment[sv]=Resultatet av att dela innehåll Comment[ta]=எதையோ பகிர்ந்த‍தன் விளைவு