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-23 01:37:46 +00:00
parent c4ce19e9cd
commit ee94eb4b83

View file

@ -44,6 +44,7 @@
"Description[eo]": "Montri sciigojn de viaj aparatoj per KDE Connect",
"Description[es]": "Mustra notificaciones de sus otros dispositivos usando KDE Connect",
"Description[eu]": "Erakutsi zure gailuetako jakinarazpenak KDE Connect erabiliz",
"Description[fr]": "Afficher des notifications provenant de vos périphériques en utilisant KDE Connect",
"Description[gl]": "Amosar as notificacións dos dispositivos con KDE Connect.",
"Description[ia]": "Monstra notificationes ex tu dispositivos usante KDE Connect",
"Description[it]": "Mostra le notifiche dei tuoi dispositivi tramite KDE Connect",