From b7dc3e369835c74a7bc1133467d4552b16206a3f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 28 Oct 2023 02:14:03 +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/plugins/kscreen/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/kscreen/metadata.json b/src/plugins/kscreen/metadata.json index da38ab410a..8f85196884 100644 --- a/src/plugins/kscreen/metadata.json +++ b/src/plugins/kscreen/metadata.json @@ -58,7 +58,7 @@ "Name[et]": "Kscreen", "Name[eu]": "Kscreen", "Name[fi]": "KScreen", - "Name[fr]": "Kscreen", + "Name[fr]": "KScreen", "Name[hu]": "Kscreen", "Name[ia]": "Kscreen", "Name[id]": "KScreen",