From a452ee6d164b93e628659963946b8c2cbe62973e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 4 Aug 2022 01:45:07 +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 935a876ed..7d257e6a4 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -59,6 +59,7 @@ "Description[pl]": "Współdzieli kontakty podłączonego urządzenia z komputerem", "Description[pt]": "Sincronizar os Contactos do Dispositivo Ligado para o Sistema", "Description[sl]": "Uskladi stike iz povezane naprave na namizje", + "Description[sv]": "Synkronisera kontakter från ansluten enhet till skrivbordet", "Description[tr]": "Bağlı Aygıttaki Kişileri Masaüstüne Eşzamanla", "Description[uk]": "Синхронізація контактів зі з'єднаного пристрою на комп'ютер", "Description[x-test]": "xxSynchronize Contacts from the Connected Device to the Desktopxx",