From da09ad4bf2d775346ff7fade704c24df5c202034 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 1 Nov 2020 06:35:57 +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 a194bc900..719ce374f 100644 --- a/linux/org.eu.encom.spectral.desktop +++ b/linux/org.eu.encom.spectral.desktop @@ -3,6 +3,7 @@ Name=Spectral Name[ca]=Spectral Name[ca@valencia]=Spectral Name[es]=Spectral +Name[fr]=Spectral Name[nl]=Spectral Name[nn]=Spectral Name[pt]=Spectral @@ -13,6 +14,7 @@ GenericName=Matrix Client GenericName[ca]=Client del Matrix GenericName[ca@valencia]=Client del Matrix GenericName[es]=Cliente para Matrix +GenericName[fr]=Client « Matrix » GenericName[nl]=Matrix-client GenericName[nn]=Matrix-klient GenericName[pt]=Cliente de Matrix @@ -23,6 +25,7 @@ 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[es]=Cliente de MI para el protocolo Matrix +Comment[fr]=Client « IM » pour le protocole « Matrix » Comment[nl]=IM-client voor het Matrix-protocol Comment[nn]=Lynmeldings­klient for Matrix-protokollen Comment[pt]=Cliente de MI para o protocolo Matrix