From 2becc00be889859e5053cd4733fab8f5bb58eb89 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 19 Apr 2022 01:44:15 +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" --- src/lib/data/breeze-fallback/index.theme | 2 +- themes/windows/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme index cb4b01356..b3c95783c 100644 --- a/src/lib/data/breeze-fallback/index.theme +++ b/src/lib/data/breeze-fallback/index.theme @@ -39,7 +39,7 @@ Comment=Breeze Team Comment[ar]=فريق نسيم Comment[az]=Breeze Komandası Comment[ca]=L'equip del «Breeze» -Comment[ca@valencia]=L'equip del «Breeze» +Comment[ca@valencia]=L'equip de «Breeze» Comment[cs]=Team Breeze Comment[da]=Breeze-tema Comment[de]=Breeze-Team diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index cf908eb3a..7a8e4abdb 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 a Windows, basat en el «Material design» +Comment[ca@valencia]=Tema semblant a Windows, basat en «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