From 31d20fab928938954b0d2b40c13c8df964f63019 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 14 Jan 2023 02:02:24 +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 | 3 +++ src/effects/morphingpopups/package/metadata.json | 3 +++ src/effects/slidingpopups/metadata.json | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/effects/backgroundcontrast/metadata.json b/src/effects/backgroundcontrast/metadata.json index 7566192d6a..e146b44008 100644 --- a/src/effects/backgroundcontrast/metadata.json +++ b/src/effects/backgroundcontrast/metadata.json @@ -46,8 +46,11 @@ "Name[bg]": "Контраст на фона", "Name[ca@valencia]": "Contrast del fons", "Name[ca]": "Contrast del fons", + "Name[es]": "Contraste del fondo", "Name[eu]": "Atzeko planoaren kontrastea", + "Name[ka]": "ფონის კონტრასტი", "Name[nl]": "Contrast in achtergrond", + "Name[pt]": "Contraste do Fundo", "Name[ta]": "பின்புல நிறமாறுபாடு", "Name[tr]": "Arka Plan Karşıtlığı", "Name[uk]": "Контрастність тла", diff --git a/src/effects/morphingpopups/package/metadata.json b/src/effects/morphingpopups/package/metadata.json index fec53bda3d..d5bcf7ccb0 100644 --- a/src/effects/morphingpopups/package/metadata.json +++ b/src/effects/morphingpopups/package/metadata.json @@ -78,8 +78,11 @@ "Name[bg]": "Променящи се изскачащи прозорци", "Name[ca@valencia]": "Missatges emergents en metamorfosi", "Name[ca]": "Missatges emergents en metamorfosi", + "Name[es]": "Transformación de ventanas emergentes", "Name[eu]": "Eraldatzen diren gainerakorrak", + "Name[ka]": "ტრანსფორმირებადი მხტუნარები", "Name[nl]": "Morphing pop-ups", + "Name[pt]": "Janelas Mutantes", "Name[tr]": "Dönüşen Açılır Pencereler", "Name[uk]": "Аморфні контекстні панелі", "Name[x-test]": "xxMorphing Popupsxx", diff --git a/src/effects/slidingpopups/metadata.json b/src/effects/slidingpopups/metadata.json index b0f6ea9004..f97e344992 100644 --- a/src/effects/slidingpopups/metadata.json +++ b/src/effects/slidingpopups/metadata.json @@ -46,8 +46,11 @@ "Name[bg]": "Плъзгащи се изскачащи прозорци", "Name[ca@valencia]": "Missatges emergents desplaçant-se", "Name[ca]": "Missatges emergents desplaçant-se", + "Name[es]": "Deslizar ventanas emergentes", "Name[eu]": "Gainerakor irristakorrak", + "Name[ka]": "მცურავი მხტუნარები", "Name[nl]": "Schuivende pop-ups", + "Name[pt]": "Janelas Deslizantes", "Name[tr]": "Kayan Açılır Pencereler", "Name[uk]": "Ковзні контекстні вікна", "Name[x-test]": "xxSliding Popupsxx"