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 2020-06-01 05:51:26 +02:00
parent 4c011458c2
commit 7806fe73cf
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -3,15 +3,18 @@
"Authors": [
{
"Email": "aix.m@outlook.com",
"Name": "Aditya Mehra"
"Name": "Aditya Mehra",
"Name[x-test]": "xxAditya Mehraxx"
}
],
"Description": "Bigscreen Plugin",
"Description[x-test]": "xxBigscreen Pluginxx",
"EnabledByDefault": true,
"Icon": "tvtrusted",
"Id": "kdeconnect_bigscreen",
"License": "GPL",
"Name": "Bigscreen",
"Name[x-test]": "xxBigscreenxx",
"ServiceTypes": [
"KdeConnect/Plugin"
],