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"
This commit is contained in:
l10n daemon script 2026-09-04 01:41:57 +00:00
parent 16ebca0b9e
commit 25d20b3c1e

View file

@ -121,6 +121,7 @@ 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[uk]=Увімкнути чи вимкнути читання з екрана
Name[zh_CN]=屏幕阅读器打开/关闭
Exec=dbus-send --type=method_call --print-reply --dest=org.kde.kded6 /modules/screenreader org.kde.screenreader.toggle
X-KDE-Shortcuts=Meta+Alt+S
X-KDE-Migrate-Shortcut=kaccess,Toggle Screen Reader On and Off