From 7f21dd910d99b6b462077f1cf2fbe707c73579c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 26 Jul 2022 01:44:57 +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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index 785e2f820..ac71f9cbb 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -46,9 +46,12 @@ } ], "Description": "Synchronize Contacts from the Connected Device to the Desktop", + "Description[az]": "Əlaqələri qoşulmuş cihazdan iş masasına eyniləşdirin", "Description[ca]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori", + "Description[fr]": "Synchroniser les contacts du périphérique connecté avec ceux du bureau", "Description[nl]": "Contactpersonen synchroniseren uit het verbonden apparaat naar het bureaublad", "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", "Description[uk]": "Синхронізація контактів зі з'єднаного пристрою на комп'ютер", "Description[x-test]": "xxSynchronize Contacts from the Connected Device to the Desktopxx",