From 34c1231d60cc177a9e2d79a515de191c0a4c8723 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 15 Apr 2022 01:50:12 +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/blendchanges/metadata.json |  4 +++-
 src/effects/windowview/metadata.json   | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/effects/blendchanges/metadata.json b/src/effects/blendchanges/metadata.json
index aca15484d8..420e6716ba 100644
--- a/src/effects/blendchanges/metadata.json
+++ b/src/effects/blendchanges/metadata.json
@@ -15,6 +15,7 @@
         "Description[uk]": "Анімація змін у стилі системи",
         "Description[vi]": "Tạo hiệu ứng động cho các thay đổi kiểu cách hệ thống",
         "Description[x-test]": "xxAnimates system style changesxx",
+        "Description[zh_CN]": "动画过渡系统风格更改",
         "EnabledByDefault": true,
         "Id": "blendchanges",
         "License": "GPL",
@@ -31,7 +32,8 @@
         "Name[sv]": "Blanda ändringar",
         "Name[uk]": "Злиття змін",
         "Name[vi]": "Pha trộn các thay đổi",
-        "Name[x-test]": "xxBlend Changesxx"
+        "Name[x-test]": "xxBlend Changesxx",
+        "Name[zh_CN]": "平滑过渡更改"
     },
     "org.kde.kwin.effect": {
         "internal": true
diff --git a/src/effects/windowview/metadata.json b/src/effects/windowview/metadata.json
index 1ae50baa81..e0b68c2dc4 100644
--- a/src/effects/windowview/metadata.json
+++ b/src/effects/windowview/metadata.json
@@ -2,10 +2,22 @@
     "KPlugin": {
         "Category": "Window Management",
         "Description": "Helper effect for the task manager",
+        "Description[ca@valencia]": "Efecte auxiliar per al gestor de tasques",
+        "Description[ca]": "Efecte auxiliar per al gestor de tasques",
+        "Description[nl]": "Effect van hulp voor de takenbeheerder",
+        "Description[sv]": "Hjälpeffekt för aktivitetshanteraren",
+        "Description[uk]": "Допоміжний ефект для керування завданнями",
+        "Description[x-test]": "xxHelper effect for the task managerxx",
         "EnabledByDefault": true,
         "Id": "windowview",
         "License": "GPL",
-        "Name": "Window View"
+        "Name": "Window View",
+        "Name[ca@valencia]": "Vista de finestres",
+        "Name[ca]": "Vista de finestres",
+        "Name[nl]": "Weergave met vensters",
+        "Name[sv]": "Fönstervy",
+        "Name[uk]": "Перегляд вікон",
+        "Name[x-test]": "xxWindow Viewxx"
     },
     "org.kde.kwin.effect": {
         "internal": true