From 14cf7524b645fc0b9f485682d02a466c4b04217f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 7 May 2022 01:44:29 +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/desktopgrid/metadata.json | 1 - src/kcmkwin/kwinscripts/kwinscripts.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/effects/desktopgrid/metadata.json b/src/effects/desktopgrid/metadata.json index 5ce861d787..802e1cf3e8 100644 --- a/src/effects/desktopgrid/metadata.json +++ b/src/effects/desktopgrid/metadata.json @@ -67,7 +67,6 @@ "Name[vi]": "Lưới bàn làm việc", "Name[x-test]": "xxDesktop Gridxx", "Name[zh_CN]": "虚拟桌面平铺网格" - }, "X-KDE-ConfigModule": "kwin_desktopgrid_config", "X-KWin-Border-Activate": true, diff --git a/src/kcmkwin/kwinscripts/kwinscripts.json b/src/kcmkwin/kwinscripts/kwinscripts.json index 8d2b9e50ac..25012a0872 100644 --- a/src/kcmkwin/kwinscripts/kwinscripts.json +++ b/src/kcmkwin/kwinscripts/kwinscripts.json @@ -27,6 +27,7 @@ "Name[az]": "Kwin skriptləri", "Name[ca@valencia]": "Scripts de KWin", "Name[ca]": "Scripts del KWin", + "Name[cs]": "Skripty KWinu", "Name[es]": "Guiones de KWin", "Name[fr]": "Scripts pour KWin", "Name[ia]": "Script de KWin",