From ed43fcb236afa791bd140280260950f493a0f332 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 28 Jul 2022 01:43:54 +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 8225316c3..72a642f1b 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -51,6 +51,7 @@ "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[nn]": "Synkroniser kontaktar frå tilkopla eining og til skrivebordet", "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",