From fa99b8829d9cb31da10d4058e8044aefcd2ae635 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Mar 2024 01:15:35 +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 2c8cf692a..005cd1373 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -257,6 +257,7 @@ Name[ia]=Comparti Name[it]=Condivisione Name[ka]=გაზიარება Name[nl]=Gedeelde +Name[pl]=Udostępnij Name[sl]=Deli Name[tr]=Paylaş Name[uk]=Оприлюднення @@ -273,6 +274,7 @@ Comment[ia]=Le exito de compartir un pecietta de contento Comment[it]=Il risultato della condivisione di un contenuto Comment[ka]=შემცველობის ნაწილის გაზიარების შედეგი Comment[nl]=Het resultaat van het delen van een stukje inhoud +Comment[pl]=Wynik udostępniania kawałka treści Comment[sl]=Rezultat deljenega kosa vsebine Comment[tr]=Bir parça içerik paylaşımının sonucu Comment[uk]=Результат оприлюднення даних