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 2021-02-19 16:58:52 +01:00
parent 8b062714dc
commit f0aca93646
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -28,6 +28,7 @@
"Name[pt]": "Aditya Mehra", "Name[pt]": "Aditya Mehra",
"Name[pt_BR]": "Aditya Mehra", "Name[pt_BR]": "Aditya Mehra",
"Name[ro]": "Aditya Mehra", "Name[ro]": "Aditya Mehra",
"Name[ru]": "Aditya Mehra",
"Name[sk]": "Aditya Mehra", "Name[sk]": "Aditya Mehra",
"Name[sl]": "Aditya Mehra", "Name[sl]": "Aditya Mehra",
"Name[sv]": "Aditya Mehra", "Name[sv]": "Aditya Mehra",