From 84c7e28d291bb8b826e70f8395cdadd328b4a8f1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 30 Jul 2022 01:44:31 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index 72a642f1b..390d6b3a9 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -50,6 +50,7 @@ "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[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[pt]": "Sincronizar os Contactos do Dispositivo Ligado para o Sistema",