From debf06ea8793edd50c1af63f1746a9eb34c6b04e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 11 May 2023 02:19: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" --- kwin/scripts/convergentwindows/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kwin/scripts/convergentwindows/metadata.json b/kwin/scripts/convergentwindows/metadata.json index 05958d8b..cae62574 100644 --- a/kwin/scripts/convergentwindows/metadata.json +++ b/kwin/scripts/convergentwindows/metadata.json @@ -9,7 +9,7 @@ "Name[ca]": "Plata Hill", "Name[cs]": "Plata Hill", "Name[en_GB]": "Plata Hill", - "Name[eo]": "Plata Monteto", + "Name[eo]": "Plata Hill", "Name[es]": "Plata Hill", "Name[eu]": "Plata Hill", "Name[fi]": "Plata Hill",