From 7891ee6c41592b9db0d18e8bea8c786b86471f76 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 12 Jul 2024 01:19:11 +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/fadingpopups/package/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/fadingpopups/package/metadata.json b/src/plugins/fadingpopups/package/metadata.json index bf13d6dce6..83c20eeb9d 100644 --- a/src/plugins/fadingpopups/package/metadata.json +++ b/src/plugins/fadingpopups/package/metadata.json @@ -102,7 +102,7 @@ "Name[zh_CN]": "气泡显隐渐变动画", "Name[zh_TW]": "淡化彈出視窗" }, - "X-KDE-Ordering": 60, "X-KDE-BlocksDirectScanout": false, + "X-KDE-Ordering": 60, "X-Plasma-API": "javascript" }