From 844e2192868b7f8283dc3a1dce3762086ac2a095 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 26 Sep 2026 01:44:02 +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"
---
 .../device-actions/solid-device-OpticalDisc.desktop             | 1 +
 .../device-actions/solid-device-StorageVolume.desktop           | 1 +
 kded/screenreader/org.kde.screenreader.desktop                  | 2 ++
 knetattach/org.kde.knetattach.desktop                           | 1 +
 4 files changed, 5 insertions(+)

diff --git a/kcms/solid_actions/device-actions/solid-device-OpticalDisc.desktop b/kcms/solid_actions/device-actions/solid-device-OpticalDisc.desktop
index 73be1d49b1..adb1c71ad4 100644
--- a/kcms/solid_actions/device-actions/solid-device-OpticalDisc.desktop
+++ b/kcms/solid_actions/device-actions/solid-device-OpticalDisc.desktop
@@ -917,6 +917,7 @@ Name[ta]=Uuid
 Name[tg]=Uuid
 Name[th]=ค่า Uuid
 Name[tr]=UUID
+Name[ug]=Uuid
 Name[uk]=Uuid
 Name[vi]=UUID
 Name[wa]=Uuid
diff --git a/kcms/solid_actions/device-actions/solid-device-StorageVolume.desktop b/kcms/solid_actions/device-actions/solid-device-StorageVolume.desktop
index b705d2b7c7..65ee924e62 100644
--- a/kcms/solid_actions/device-actions/solid-device-StorageVolume.desktop
+++ b/kcms/solid_actions/device-actions/solid-device-StorageVolume.desktop
@@ -455,6 +455,7 @@ Name[ta]=Uuid
 Name[tg]=Uuid
 Name[th]=ค่า Uuid
 Name[tr]=UUID
+Name[ug]=Uuid
 Name[uk]=Uuid
 Name[vi]=UUID
 Name[wa]=Uuid
diff --git a/kded/screenreader/org.kde.screenreader.desktop b/kded/screenreader/org.kde.screenreader.desktop
index 7bd033bbce..df00b6d1d5 100644
--- a/kded/screenreader/org.kde.screenreader.desktop
+++ b/kded/screenreader/org.kde.screenreader.desktop
@@ -119,12 +119,14 @@ Name[it]=Attiva e disattiva il lettore dello schermo
 Name[ka]=ეკრანის წამკითხველის ჩართვა/გამორთვა
 Name[lt]=Įjungti arba išjungti ekrano skaityklę
 Name[nl]=Schermlezer aan en uit omschakelen
+Name[nn]=Slå skjermlesar på/av
 Name[pt_BR]=Ativar e desativar o leitor de tela
 Name[ru]=Включить/выключить зачитывание с экрана
 Name[sk]=Prepnúť čítanie obsahu obrazovky
 Name[sl]=Vklop in izklop bralnika zaslona
 Name[sv]=Stäng av eller sätt på skärmläsare
 Name[tr]=Ekran Okuyucusunu Aç/Kapat
+Name[ug]=ئېكران ئوقۇغۇچنى ئاچ ياكى تاقا
 Name[uk]=Увімкнути чи вимкнути читання з екрана
 Name[zh_CN]=屏幕阅读器打开/关闭
 Name[zh_TW]=切換螢幕閱讀器開關
diff --git a/knetattach/org.kde.knetattach.desktop b/knetattach/org.kde.knetattach.desktop
index 1ccddc9ed0..f54ff18809 100755
--- a/knetattach/org.kde.knetattach.desktop
+++ b/knetattach/org.kde.knetattach.desktop
@@ -80,6 +80,7 @@ Name[te]=కెనెట్ ఎటాచ్
 Name[tg]=KNetAttach
 Name[th]=KNetAttach
 Name[tr]=KNetAttach
+Name[ug]=KNetAttach
 Name[uk]=KNetAttach
 Name[uz]=KNetAttach
 Name[uz@cyrillic]=KNetAttach