From 077844ba61fe79f1b1c9982b3eb7209c51532300 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 12 Apr 2021 01:15:08 +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 +- org.kde.neochat.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neochat.notifyrc b/neochat.notifyrc index 1b98de8f4..21d070548 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -23,7 +23,7 @@ DesktopEntry=org.kde.neochat Comment=A client for matrix, the decentralized communication protocol Comment[az]=Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu Comment[ca]=Un client per a Matrix, el protocol de comunicacions descentralitzat -Comment[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat +Comment[ca@valencia]=Un client per a Matrix, el protocol de comunicacions descentralitzat Comment[de]=Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll Comment[en_GB]=A client for matrix, the decentralised communication protocol Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop index fb757fc61..46949eb50 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -21,7 +21,7 @@ Name[x-test]=xxNeoChatxx GenericName=Matrix Client GenericName[az]=Matrix Müştərisi GenericName[ca]=Client de Matrix -GenericName[ca@valencia]=Client del Matrix +GenericName[ca@valencia]=Client de Matrix GenericName[cs]=Klient protokolu Matrix GenericName[de]=Matrix-Programm GenericName[en_GB]=Matrix Client