From 84a5c7b314965853fb21cda8128809ebf4af795a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 4 Nov 2021 01:18:07 +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/effects/backgroundcontrast/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/effects/backgroundcontrast/metadata.json b/src/effects/backgroundcontrast/metadata.json index 1e65b9e55f..81e0b00ecc 100644 --- a/src/effects/backgroundcontrast/metadata.json +++ b/src/effects/backgroundcontrast/metadata.json @@ -3,7 +3,7 @@ "Category": "Appearance", "Description": "Improve contrast and readability behind semi-transparent windows", "Description[az]": "Yarımşəffaf pəncərənin altındakı fonun kontrastını yaxşılaşdırır", - "Description[ca]": "Millora el contrast i la legibilitat darrere de les finestres semitransparents", + "Description[ca]": "Millora el contrast i la llegibilitat darrere de les finestres semitransparents", "Description[cs]": "Vylepšit kontrast a čitelnost za poloprůhlednými okny", "Description[es]": "Mejora el contraste y la legibilidad detrás de las ventanas semitransparentes", "Description[fr]": "Améliore le contraste et la lisibilité derrière les fenêtres semi transparentes",