From 262a8392a59a58da5b1963f8f7b7768d1a013e13 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 14 Nov 2023 02:08:47 +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 ab7fb6e0..e52149eb 100644 --- a/kwin/scripts/convergentwindows/metadata.json +++ b/kwin/scripts/convergentwindows/metadata.json @@ -57,8 +57,8 @@ "Description[uk]": "Вилучає оздоблення вікон та максимізує вікна лише на першому екрані.", "Description[x-test]": "xxRemoves window decorations and maximizes windows on the first screen only.xx", "Description[zh_CN]": "删除窗口装饰并最大化第一个屏幕上的窗口。", - "Id": "convergentwindows", "Icon": "preferences-system-windows", + "Id": "convergentwindows", "License": "LGPL-2.1-or-later", "Name": "Convergent Windows", "Name[ca@valencia]": "Finestres convergents",