From 659ed39edfb574aaf4eef39dc803ed49ef8d9deb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 29 Apr 2018 05:21:10 +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 14d1c8a92..2228e5d30 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -11,6 +11,7 @@ "Description": "Synchronize Contacts Between the Desktop and the Connected Device", "Description[ca]": "Sincronitza els contactes entre l'escriptori i el dispositiu connectat", "Description[cs]": "Synchronizovat kontakty mezi pracovní plochou a připojeným zařízením", + "Description[en_GB]": "Synchronise Contacts Between the Desktop and the Connected Device", "Description[gl]": "Sincronizar contactos entre o escritorio e o dispositivo conectado", "Description[nl]": "Contactpersonen synchroniseren tussen het bureaublad en het verbonden apparaat", "Description[pt]": "Sincronizar os Contactos entre o Sistema e o Dispositivo Ligado",