From 2de51770dee87b6547aae189442bbfc9f78eb1a0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 10 Apr 2022 01:47:26 +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 7fe7a6efe4..f6b8425ac3 100644 --- a/src/effects/blendchanges/metadata.json +++ b/src/effects/blendchanges/metadata.json @@ -3,6 +3,7 @@ "Category": "Appearance", "Description": "Animates system style changes", "Description[ar]": "تغيرات نمط تحريكات النظام", + "Description[az]": "Sistem tərzi dəyişikliklərini canlandırır", "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", @@ -17,6 +18,7 @@ "License": "GPL", "Name": "Blend Changes", "Name[ar]": "تغييرات الخلط", + "Name[az]": "Dəyişikliklərin birləşdirilməsi", "Name[ca@valencia]": "Transició de canvis", "Name[ca]": "Transició de canvis", "Name[es]": "Mezclar cambios",