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 2022-04-10 01:47:26 +00:00
parent c1a895effa
commit 2de51770de

View file

@ -3,6 +3,7 @@
"Category": "Appearance",
"Description": "Animates system style changes",
"Description[ar]": "تغيرات نمط تحريكات النظام",
"Description[az]": "Sistem tərzi dəyişikliklərini canlandırır",
"Description[ca@valencia]": "Anima els canvis d'estil del sistema",
"Description[ca]": "Anima els canvis d'estil del sistema",
"Description[es]": "Anima los cambios de estilo del sistema",
@ -17,6 +18,7 @@
"License": "GPL",
"Name": "Blend Changes",
"Name[ar]": "تغييرات الخلط",
"Name[az]": "Dəyişikliklərin birləşdirilməsi",
"Name[ca@valencia]": "Transició de canvis",
"Name[ca]": "Transició de canvis",
"Name[es]": "Mezclar cambios",