From 1c65ede57c7908eb526b13993778e6d6e47016f4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 1 Aug 2022 01:42:52 +0000 Subject: [PATCH] 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" --- plugins/contacts/kdeconnect_contacts.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index 0354af280..b316de589 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -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",