From babbf005784e49863458dc584b7b14451dde8626 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 Oct 2022 01:57:21 +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/snaphelper/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/effects/snaphelper/metadata.json b/src/effects/snaphelper/metadata.json index 4211202e4b..db28599eda 100644 --- a/src/effects/snaphelper/metadata.json +++ b/src/effects/snaphelper/metadata.json @@ -51,7 +51,7 @@ "Name[en_GB]": "Snap Helper", "Name[es]": "Auxiliar de ajuste", "Name[eu]": "Atxikitze laguntzailea", - "Name[fi]": "Kiinnistysavustaja", + "Name[fi]": "Kiinnitysavustaja", "Name[fr]": "Assistant pour Snap", "Name[hu]": "Középpontkereső", "Name[ia]": "Adjutante de photo",