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

@@ -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,

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",