From 4c3613088d040530e65401a9cf4aa781eaea3ffe Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 9 Aug 2022 01:44:40 +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 211002da4..d76be3c7a 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -46,6 +46,7 @@ } ], "Description": "Synchronize Contacts from the Connected Device to the Desktop", + "Description[ar]": "زامن المتراسلين بين سطح المكتب والجهاز المتصل", "Description[az]": "Əlaqələri qoşulmuş cihazdan iş masasına eyniləşdirin", "Description[bg]": "Синхронизиране на контактите между свързаното устройство и компютъра", "Description[ca@valencia]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori",