From fcfd1d7c69d6bc40ba8745404b1373c91f8bd507 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 24 Apr 2018 05:25:16 +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 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index 9504ba9e0..51b565c7b 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -4,18 +4,15 @@ "Authors": [ { "Email": "simon@ergotech.com", - "Name": "Simon Redman", - "Name[x-test]": "xxSimon Redmanxx" + "Name": "Simon Redman" } ], "Description": "Synchronize Contacts Between the Desktop and the Connected Device", - "Description[x-test]": "xxSynchronize Contacts Between the Desktop and the Connected Devicexx", "EnabledByDefault": true, "Icon": "dialog-ok", "Id": "kdeconnect_contacts", "License": "GPL", "Name": "Contacts", - "Name[x-test]": "xxContactsxx", "ServiceTypes": [ "KdeConnect/Plugin" ],