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 2024-06-11 01:18:34 +00:00
parent a6fd9f9e9e
commit 2df8782142
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/virtualmonitor/kdeconnect_virtualmonitor.json
View file

@ -66,6 +66,7 @@
"Name[it]": "Fabian Arndt", "Name[it]": "Fabian Arndt",
"Name[ka]": "Fabian Arndt", "Name[ka]": "Fabian Arndt",
"Name[nl]": "Fabian Arndt", "Name[nl]": "Fabian Arndt",
"Name[ro]": "Fabian Arndt",
"Name[sl]": "Fabian Arndt", "Name[sl]": "Fabian Arndt",
"Name[tr]": "Fabian Arndt", "Name[tr]": "Fabian Arndt",
"Name[uk]": "Fabian Arndt", "Name[uk]": "Fabian Arndt",