From 868e35d67a1eff718c149cf50a56d17450317598 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 16 May 2018 05:26:25 +0200 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 7399be1d5..58ccbe5f5 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -17,6 +17,7 @@ "Description[gl]": "Sincronizar contactos entre o escritorio e o dispositivo conectado", "Description[it]": "Sincronizza contatti tra il desktop e il dispositivo connesso", "Description[nl]": "Contactpersonen synchroniseren tussen het bureaublad en het verbonden apparaat", + "Description[nn]": "Synkroniser kontaktar mellom skrivebordet og tilkopla eining", "Description[pt]": "Sincronizar os Contactos entre o Sistema e o Dispositivo Ligado", "Description[sv]": "Synkronisera kontakter mellan skrivbordet och ansluten enhet", "Description[uk]": "Синхронізація контактів між комп'ютером і з'єднаним пристроєм",