From dcb135c2caf963814b0d14c2392fff7779e7c75b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Apr 2021 01:14:47 +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 1547b5809..1b98de8f4 100644 --- a/neochat.notifyrc +++ b/neochat.notifyrc @@ -22,7 +22,7 @@ Name[x-test]=xxNeoChatxx 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 al Matrix, el protocol de comunicacions descentralitzat +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[de]=Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll Comment[en_GB]=A client for matrix, the decentralised communication protocol diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop index bb57933d9..fb757fc61 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -20,7 +20,7 @@ Name[uk]=NeoChat Name[x-test]=xxNeoChatxx GenericName=Matrix Client GenericName[az]=Matrix Müştərisi -GenericName[ca]=Client del Matrix +GenericName[ca]=Client de Matrix GenericName[ca@valencia]=Client del Matrix GenericName[cs]=Klient protokolu Matrix GenericName[de]=Matrix-Programm