From 9dc5e5310ec0debfe0b55fcbdca738e1ef3fea8e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 12 Apr 2022 01:44:17 +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 f6b8425ac3..13104c72cb 100644 --- a/src/effects/blendchanges/metadata.json +++ b/src/effects/blendchanges/metadata.json @@ -9,6 +9,7 @@ "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[sl]": "Animiraj spremembe sloga sistema", "Description[sv]": "Animerar systemets stiländringar", "Description[uk]": "Анімація змін у стилі системи", "Description[vi]": "Tạo hiệu ứng động cho các thay đổi kiểu cách hệ thống", @@ -24,6 +25,7 @@ "Name[es]": "Mezclar cambios", "Name[fr]": "Modifications des mélanges", "Name[nl]": "Wijzigingen mengen", + "Name[sl]": "Zmešaj spremembe", "Name[sv]": "Blanda ändringar", "Name[uk]": "Злиття змін", "Name[vi]": "Pha trộn các thay đổi",