From 35c0aca980527dba0ab429b38971bc9ce562ec99 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 9 Apr 2022 01:49:59 +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/blendchanges/metadata.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/effects/blendchanges/metadata.json b/src/effects/blendchanges/metadata.json index 092777df62..7fe7a6efe4 100644 --- a/src/effects/blendchanges/metadata.json +++ b/src/effects/blendchanges/metadata.json @@ -6,6 +6,7 @@ "Description[ca@valencia]": "Anima els canvis d'estil del sistema", "Description[ca]": "Anima els canvis d'estil del sistema", "Description[es]": "Anima los cambios de estilo del sistema", + "Description[fr]": "Anime les modifications de style du système", "Description[nl]": "Systeemstijl wijzigingen animeren", "Description[sv]": "Animerar systemets stiländringar", "Description[uk]": "Анімація змін у стилі системи", @@ -19,6 +20,7 @@ "Name[ca@valencia]": "Transició de canvis", "Name[ca]": "Transició de canvis", "Name[es]": "Mezclar cambios", + "Name[fr]": "Modifications des mélanges", "Name[nl]": "Wijzigingen mengen", "Name[sv]": "Blanda ändringar", "Name[uk]": "Злиття змін",