From 1bfe7c265958a81446f5b07f5ce6b562bef3327f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 28 Feb 2023 02:08:05 +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 bfab7320b3..84f204d44d 100644 --- a/src/effects/backgroundcontrast/metadata.json +++ b/src/effects/backgroundcontrast/metadata.json @@ -50,6 +50,7 @@ "Name[ca]": "Contrast del fons", "Name[cs]": "Kontrast pozadí", "Name[de]": "Hintergrundkontrast", + "Name[en_GB]": "Background Contrast", "Name[es]": "Contraste del fondo", "Name[eu]": "Atzeko planoaren kontrastea", "Name[fr]": "Contraste de l'arrière-plan", diff --git a/src/effects/morphingpopups/package/metadata.json b/src/effects/morphingpopups/package/metadata.json index 50cf8a50f1..0cbb6a831b 100644 --- a/src/effects/morphingpopups/package/metadata.json +++ b/src/effects/morphingpopups/package/metadata.json @@ -86,6 +86,7 @@ "Name[ca]": "Missatges emergents en metamorfosi", "Name[cs]": "Morfující vyskakovací okna", "Name[de]": "Verformende Aufklappfenster", + "Name[en_GB]": "Morphing Popups", "Name[es]": "Transformación de ventanas emergentes", "Name[eu]": "Eraldatzen diren gainerakorrak", "Name[fr]": "Effectuer un fondu enchaîné des infobulles", diff --git a/src/effects/slidingpopups/metadata.json b/src/effects/slidingpopups/metadata.json index 958f5098bc..c6bfb7cf6e 100644 --- a/src/effects/slidingpopups/metadata.json +++ b/src/effects/slidingpopups/metadata.json @@ -50,6 +50,7 @@ "Name[ca]": "Missatges emergents desplaçant-se", "Name[cs]": "Klouzající vyskakovací okna", "Name[de]": "Hereingleitende Aufklappfenster", + "Name[en_GB]": "Sliding Popups", "Name[es]": "Deslizar ventanas emergentes", "Name[eu]": "Gainerakor irristakorrak", "Name[fr]": "Annotations glissantes",