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 2023-08-20 01:37:53 +00:00
parent 70857972fc
commit e3257907ab

View file

@ -37,6 +37,7 @@
],
"Category": "System Information",
"Description": "Show notifications from your devices using KDE Connect",
"Description[ar]": "أظهر الإخطارات من أجهزتك باستخدام «كِيدِي المتّصل»",
"Description[bg]": "Показване на известия от вашите устройства чрез KDE Connect",
"Description[ca@valencia]": "Mostra les notificacions dels vostres dispositius emprant KDE Connect",
"Description[ca]": "Mostra les notificacions dels vostres dispositius emprant el KDE Connect",