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-10-09 10:17:02 +02:00
parent 180c87353b
commit a5507c1501
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/bigscreen/kdeconnect_bigscreen.json
View file

@ -29,7 +29,8 @@
"Name[sl]": "Aditya Mehra", "Name[sl]": "Aditya Mehra",
"Name[sv]": "Aditya Mehra", "Name[sv]": "Aditya Mehra",
"Name[uk]": "Aditya Mehra", "Name[uk]": "Aditya Mehra",
"Name[x-test]": "xxAditya Mehraxx" "Name[x-test]": "xxAditya Mehraxx",
"Name[zh_CN]": "Aditya Mehra"
} }
], ],
"Description": "Bigscreen Plugin", "Description": "Bigscreen Plugin",