From 3c5cd095b834f9deea147b5e4e458f0c0533c535 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 27 Oct 2020 06:19:17 +0100 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" --- linux/org.eu.encom.spectral.desktop | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux/org.eu.encom.spectral.desktop b/linux/org.eu.encom.spectral.desktop index ba0d6de30..f348d74ac 100644 --- a/linux/org.eu.encom.spectral.desktop +++ b/linux/org.eu.encom.spectral.desktop @@ -3,18 +3,21 @@ Name=Spectral Name[ca]=Spectral Name[ca@valencia]=Spectral Name[nl]=Spectral +Name[sv]=Spectral Name[uk]=Spectral Name[x-test]=xxSpectralxx GenericName=Matrix Client GenericName[ca]=Client del Matrix GenericName[ca@valencia]=Client del Matrix GenericName[nl]=Matrix-client +GenericName[sv]=Matrix-klient GenericName[uk]=Клієнт Matrix GenericName[x-test]=xxMatrix Clientxx Comment=IM client for the Matrix protocol Comment[ca]=Client de MI per al protocol Matrix Comment[ca@valencia]=Client de MI per al protocol Matrix Comment[nl]=IM-client voor het Matrix-protocol +Comment[sv]=Direktmeddelandeklient för protokollet Matrix Comment[uk]=Клієнт служби миттєвого обміну повідомленнями для протоколу Matrix Comment[x-test]=xxIM client for the Matrix protocolxx Exec=spectral