From 4a549b035feb49aec22f3dc707dd3a5ccc462055 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 1 Apr 2022 01:57: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" --- 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 569f05c5f..cf908eb3a 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -36,7 +36,7 @@ Name[zh_TW]=Windows Comment=Windows like theme based on Material design Comment[az]=Material dizaynında Windows oxşarı mövzu Comment[ca]=Tema semblant al Windows, basat en el «Material design» -Comment[ca@valencia]=Tema semblant al Windows, basat en el «Material design» +Comment[ca@valencia]=Tema semblant a Windows, basat en el «Material design» Comment[cs]=Motiv podobný Windows založený na designu Material Comment[da]=Windows-lignende tema baseret på Material design Comment[de]=Windows ähnliches Design auf der Basis des Designs Material