tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2018-04-24 05:25:16 +02:00
parent 755091b447
commit fcfd1d7c69
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/contacts/kdeconnect_contacts.json
View file

@ -4,18 +4,15 @@
"Authors": [ "Authors": [
{ {
"Email": "simon@ergotech.com", "Email": "simon@ergotech.com",
"Name": "Simon Redman", "Name": "Simon Redman"
"Name[x-test]": "xxSimon Redmanxx"
} }
], ],
"Description": "Synchronize Contacts Between the Desktop and the Connected Device", "Description": "Synchronize Contacts Between the Desktop and the Connected Device",
"Description[x-test]": "xxSynchronize Contacts Between the Desktop and the Connected Devicexx",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "dialog-ok", "Icon": "dialog-ok",
"Id": "kdeconnect_contacts", "Id": "kdeconnect_contacts",
"License": "GPL", "License": "GPL",
"Name": "Contacts", "Name": "Contacts",
"Name[x-test]": "xxContactsxx",
"ServiceTypes": [ "ServiceTypes": [
"KdeConnect/Plugin" "KdeConnect/Plugin"
], ],