From 54cf9ad4952b853b974255ff64bdaba880588348 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 3 Jul 2023 03:50:48 +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" --- org.kde.neochat.desktop | 2 +- src/neochat.notifyrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop index c2cd4fdcc..e0233c37a 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -100,7 +100,7 @@ Comment[ka]=კლიენტი Matrix-ის პროტოკოლის Comment[ko]=Matrix 프로토콜용 클라이언트 Comment[lt]=Matrix protokolo kliento programa Comment[nl]=Client voor het Matrix-protocol -Comment[nn]=Lynmeldings­klient for Matrix-protokollen +Comment[nn]=Klient for Matrix-protokollen Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈਂਟ ਹੈ Comment[pl]=Program obsługi protokołu Matriksa Comment[pt]=Cliente para o protocolo Matrix diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc index cd027f718..c84f87da3 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -62,7 +62,7 @@ Comment[ka]=კლიენტი Matrix-სთვის, დეცენტრ Comment[ko]=Matrix, 분산 대화 프로토콜 클라이언트 Comment[lt]=Matrix decentralizuoto bendravimo protokolo kliento programa Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol -Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen. +Comment[nn]=Ein klient for Matrix – protokollen for desentralisert kommunikasjon Comment[pa]=ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ Comment[pl]=Program do obsługi matriksa, rozproszonego protokołu porozumiewania się Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicações