From 427e95a10364bf9cb2e23f6755a2f12cf4505546 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Feb 2023 03:47:00 +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 b85ec5f42..cb47c4423 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -53,6 +53,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[cs]": "Synchronizovat kontakty z připojeného zařízení do pracovního prostředí", + "Description[de]": "Abgleich von Kontakten vom angeschlossenen Gerät zum Arbeitsplatz", "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",