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-11-21 03:06:11 +00:00
parent e7c675f6a5
commit 7e4ff4495b

View file

@ -69,6 +69,7 @@
"Description[pt_BR]": "Sincroniza os contatos entre do dispositivo conectado para a área de trabalho",
"Description[ro]": "Sincronizare contacte de pe dispozitivul conectat pe calculator",
"Description[ru]": "Синхронизация контактов с подключённого устройства на компьютер",
"Description[sk]": "Synchronizácia kontaktov medzi počítačom a pripojeným zariadením",
"Description[sl]": "Uskladi stike iz povezane naprave na namizje",
"Description[sv]": "Synkronisera kontakter från ansluten enhet till skrivbordet",
"Description[tr]": "Bağlı Aygıttaki Kişileri Masaüstüne Eşzamanla",