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-01 01:42:52 +00:00
parent cdc5f1eba2
commit 1c65ede57c
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/contacts/kdeconnect_contacts.json
View file

@ -49,11 +49,13 @@
"Description[az]": "Əlaqələri qoşulmuş cihazdan iş masasına eyniləşdirin",
"Description[ca@valencia]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori",
"Description[ca]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori",
"Description[es]": "Sincronizar contactos desde el dispositivo conectado al equipo de escritorio",
"Description[eu]": "Sinkronizatu kontaktuak konektatutako gailutik mahaigainera",
"Description[fr]": "Synchroniser les contacts du périphérique connecté avec ceux du bureau",
"Description[it]": "Sincronizza i contatti dal dispositivo connesso al desktop",
"Description[nl]": "Contactpersonen synchroniseren uit het verbonden apparaat naar het bureaublad",
"Description[nn]": "Synkroniser kontaktar frå tilkopla eining og til skrivebordet",
"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[tr]": "Bağlı Aygıttaki Kişileri Masaüstüne Eşzamanla",