tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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-04 01:45:07 +00:00
parent 65d83a6229
commit a452ee6d16
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/contacts/kdeconnect_contacts.json
View file

@ -59,6 +59,7 @@
"Description[pl]": "Współdzieli kontakty podłączonego urządzenia z komputerem",
"Description[pt]": "Sincronizar os Contactos do Dispositivo Ligado para o Sistema",
"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",
"Description[uk]": "Синхронізація контактів зі з'єднаного пристрою на комп'ютер",
"Description[x-test]": "xxSynchronize Contacts from the Connected Device to the Desktopxx",