From b6c497d337cbc6b8fd3c3ae544c7df3b03977e05 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 19 Feb 2023 02:02:23 +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" --- themes/windows/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index c1432f4f6..b80daf9ea 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -52,7 +52,7 @@ Comment[es]=Tema estilo Windows basado en el diseño Material Comment[et]=Windowsi meenutav teema, mille aluseks on Materiali disain Comment[eu]=Windows-en antzeko gaia «Material design»en oinarritua Comment[fi]=Material-designiin pohjautuva Windowsin kaltainen teema -Comment[fr]=Thème « Windows » inspiré par Material +Comment[fr]=Thème « Windows » inspiré par le thème « Material » Comment[gl]=Tema parecido a Windows baseado no deseño material Comment[ia]=Thema simile a Windows basate su dessigno Material Comment[id]=Tema seperti Windows berdasarkan pada desain Material