From b9bd2aabff2fc8b4989bcb19c9a5d19d32f0d1c3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 26 Oct 2020 06:08:59 +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 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/linux/org.eu.encom.spectral.desktop b/linux/org.eu.encom.spectral.desktop index 5c46f333f..ba0d6de30 100644 --- a/linux/org.eu.encom.spectral.desktop +++ b/linux/org.eu.encom.spectral.desktop @@ -1,7 +1,22 @@ [Desktop Entry] Name=Spectral +Name[ca]=Spectral +Name[ca@valencia]=Spectral +Name[nl]=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[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[uk]=Клієнт служби миттєвого обміну повідомленнями для протоколу Matrix +Comment[x-test]=xxIM client for the Matrix protocolxx Exec=spectral Terminal=false Icon=org.eu.encom.spectral