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"

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

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

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]=切換螢幕閱讀器開關

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