From ab054f060d5ae2c1f2ce8fb5398876c2c2a7a9ff Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 Oct 2022 01:56:08 +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 c5b5a89f7..de6273924 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -55,6 +55,7 @@ "Description[en_GB]": "Synchronise Contacts from the Connected Device to the Desktop", "Description[es]": "Sincronizar contactos desde el dispositivo conectado al equipo de escritorio", "Description[eu]": "Sinkronizatu kontaktuak konektatutako gailutik mahaigainera", + "Description[fi]": "Synkronoi yhteystiedot yhdistetyltä laitteelta työpöydälle", "Description[fr]": "Synchroniser les contacts du périphérique connecté avec ceux du bureau", "Description[is]": "Samstilltu tengiliði af tengda tækinu yfir á tölvuna", "Description[it]": "Sincronizza i contatti dal dispositivo connesso al desktop",