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-09-11 06:16:50 +02:00
parent 3b91acf082
commit 6818cbe881
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/sms/kdeconnect_sms.json
View file

@ -3,7 +3,8 @@
"Authors": [ "Authors": [
{ {
"Email": "simon@ergotech.com", "Email": "simon@ergotech.com",
"Name": "Simon Redman" "Name": "Simon Redman",
"Name[x-test]": "xxSimon Redmanxx"
} }
], ],
"Description": "Send and receive SMS", "Description": "Send and receive SMS",