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-08-09 01:44:40 +00:00
parent 7e72879845
commit 4c3613088d

View file

@ -46,6 +46,7 @@
}
],
"Description": "Synchronize Contacts from the Connected Device to the Desktop",
"Description[ar]": "زامن المتراسلين بين سطح المكتب والجهاز المتصل",
"Description[az]": "Əlaqələri qoşulmuş cihazdan iş masasına eyniləşdirin",
"Description[bg]": "Синхронизиране на контактите между свързаното устройство и компютъра",
"Description[ca@valencia]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori",