From 3b391c9f67bf9c29e54178cb851680f0f3fc4c34 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 11 Feb 2023 01:59:50 +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 | 1 + src/effects/morphingpopups/package/metadata.json | 1 + src/effects/slidingpopups/metadata.json | 1 + 3 files changed, 3 insertions(+) diff --git a/src/effects/backgroundcontrast/metadata.json b/src/effects/backgroundcontrast/metadata.json index ae0e900e4e..2525d007fb 100644 --- a/src/effects/backgroundcontrast/metadata.json +++ b/src/effects/backgroundcontrast/metadata.json @@ -44,6 +44,7 @@ "License": "GPL", "Name": "Background Contrast", "Name[ar]": "تباين الخلفية", + "Name[be]": "Кантраснасць фону", "Name[bg]": "Контраст на фона", "Name[ca@valencia]": "Contrast del fons", "Name[ca]": "Contrast del fons", diff --git a/src/effects/morphingpopups/package/metadata.json b/src/effects/morphingpopups/package/metadata.json index cd1e1029a8..211f39c283 100644 --- a/src/effects/morphingpopups/package/metadata.json +++ b/src/effects/morphingpopups/package/metadata.json @@ -78,6 +78,7 @@ "License": "GPL", "Name": "Morphing Popups", "Name[ar]": "المنبثقات المتحورة", + "Name[be]": "Трансфармаванне выплыўных акон", "Name[bg]": "Променящи се изскачащи прозорци", "Name[ca@valencia]": "Missatges emergents en metamorfosi", "Name[ca]": "Missatges emergents en metamorfosi", diff --git a/src/effects/slidingpopups/metadata.json b/src/effects/slidingpopups/metadata.json index 472dd92d52..2a4b025f6b 100644 --- a/src/effects/slidingpopups/metadata.json +++ b/src/effects/slidingpopups/metadata.json @@ -44,6 +44,7 @@ "License": "GPL", "Name": "Sliding Popups", "Name[ar]": "منبثقات التمرير", + "Name[be]": "Рухомыя выплыўныя вокны", "Name[bg]": "Плъзгащи се изскачащи прозорци", "Name[ca@valencia]": "Missatges emergents desplaçant-se", "Name[ca]": "Missatges emergents desplaçant-se",