From 49852cc096dddf13aecbd83db1ccd571d27b5d39 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 1 Mar 2024 01:15:05 +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/kcms/compositing/kwincompositing.json |  2 +-
 src/plugins/hidecursor/metadata.json      | 26 ++++++++++++++++++++++-
 src/plugins/outputlocator/metadata.json   |  2 ++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/kcms/compositing/kwincompositing.json b/src/kcms/compositing/kwincompositing.json
index a82f80afab..4eae3de5e5 100644
--- a/src/kcms/compositing/kwincompositing.json
+++ b/src/kcms/compositing/kwincompositing.json
@@ -76,7 +76,7 @@
         "Name[ko]": "컴포지터",
         "Name[lt]": "Kompozitorius",
         "Name[lv]": "Kompozitors",
-        "Name[nl]": "Compositor",
+        "Name[nl]": "Samensteller",
         "Name[nn]": "Samansetjar",
         "Name[pl]": "Kompozytor",
         "Name[pt]": "Compositor",
diff --git a/src/plugins/hidecursor/metadata.json b/src/plugins/hidecursor/metadata.json
index c6ad955dd2..846b101a39 100644
--- a/src/plugins/hidecursor/metadata.json
+++ b/src/plugins/hidecursor/metadata.json
@@ -2,9 +2,33 @@
     "KPlugin": {
         "Category": "Accessibility",
         "Description": "Hide mouse cursor on inactivity or keyboard input",
+        "Description[ca]": "Oculta el cursor del ratolí per inactivitat o per entrada de teclat",
+        "Description[es]": "Ocultar el cursor del ratón cuando no haya actividad o al usar el teclado",
+        "Description[eu]": "Ezkutatu saguaren kurtsorea jarduerarik ez dagoenean edo teklatuaren sarrera dagoenean",
+        "Description[ia]": "Cela cursor de mus sur inactivitate o ingresso de claviero",
+        "Description[ka]": "თაგუნას კურსორის დამალვა კლავიატურიდან შეყვანისას ან უქმეობისას",
+        "Description[lt]": "Slėpti pelės žymeklį neveiklumo metu ar rašant klaviatūra",
+        "Description[nl]": "Muisaanwijzer verbergen bij inactiviteit of invoer van het toetsenbord",
+        "Description[sl]": "Skrij miškino kazalko pri nedejavnosti ali vnosu s tipkovnice",
+        "Description[tr]": "Hareketsizlikte veya klavye girişinde fare imlecini gizle",
+        "Description[uk]": "Приховати вказівник миші при бездіяльності або введенні з клавіатури",
+        "Description[x-test]": "xxHide mouse cursor on inactivity or keyboard inputxx",
+        "Description[zh_TW]": "在沒有動作或是有鍵盤輸入時隱藏滑鼠游標",
         "EnabledByDefault": false,
         "License": "GPL",
-        "Name": "Hide Cursor"
+        "Name": "Hide Cursor",
+        "Name[ca]": "Oculta el cursor",
+        "Name[es]": "Ocultar el cursor",
+        "Name[eu]": "Ezkutatu kurtsorea",
+        "Name[ia]": "Cela Cursor",
+        "Name[ka]": "კურსორის დამალვა",
+        "Name[lt]": "Slėpti žymeklį",
+        "Name[nl]": "Cursor verbergen",
+        "Name[sl]": "Skrij kazalko",
+        "Name[tr]": "İmleci Gizle",
+        "Name[uk]": "Приховувати вказівник",
+        "Name[x-test]": "xxHide Cursorxx",
+        "Name[zh_TW]": "隱藏游標"
     },
     "X-KDE-ConfigModule": "kwin_hidecursor_config"
 }
diff --git a/src/plugins/outputlocator/metadata.json b/src/plugins/outputlocator/metadata.json
index 8051f3c06f..1650bdcf3f 100644
--- a/src/plugins/outputlocator/metadata.json
+++ b/src/plugins/outputlocator/metadata.json
@@ -78,6 +78,7 @@
         "Description[tr]": "Ekran adlarını göster",
         "Description[uk]": "Показувати назви екранів",
         "Description[x-test]": "xxShow screen namesxx",
+        "Description[zh_CN]": "显示屏幕名称",
         "Description[zh_TW]": "顯示螢幕名稱",
         "EnabledByDefault": true,
         "License": "GPL",
@@ -108,6 +109,7 @@
         "Name[tr]": "Çıktı Bulucusu",
         "Name[uk]": "Локатор виведення",
         "Name[x-test]": "xxOutput Locatorxx",
+        "Name[zh_CN]": "输出定位器",
         "Name[zh_TW]": "輸出位置檢測器"
     },
     "org.kde.kwin.effect": {