From bf56ef0eb76afad14c692bf53be83a6657a0f745 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 16 Aug 2022 01:47:35 +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 3239c307e..d8878f270 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -61,6 +61,7 @@ "Description[nn]": "Synkroniser kontaktar frå tilkopla eining og til skrivebordet", "Description[pl]": "Współdzieli kontakty podłączonego urządzenia z komputerem", "Description[pt]": "Sincronizar os Contactos do Dispositivo Ligado para o Sistema", + "Description[ro]": "Sincronizare contacte de pe dispozitivul conectat pe calculator", "Description[ru]": "Синхронизация контактов с подключённого устройства на компьютер", "Description[sl]": "Uskladi stike iz povezane naprave na namizje", "Description[sv]": "Synkronisera kontakter från ansluten enhet till skrivbordet",