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-02 01:17:34 +00:00
parent 8089806025
commit c9cac4160f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/virtualmonitor/kdeconnect_virtualmonitor.json
View file

@ -51,6 +51,7 @@
"Email": "fabian.arndt@root-core.net",
"Name": "Fabian Arndt",
"Name[ar]": "فابيان أرندت",
"Name[bg]": "Fabian Arndt",
"Name[ca@valencia]": "Fabian Arndt",
"Name[ca]": "Fabian Arndt",
"Name[cs]": "Fabian Arndt",
@ -63,7 +64,8 @@
"Name[sl]": "Fabian Arndt",
"Name[tr]": "Fabian Arndt",
"Name[uk]": "Fabian Arndt",
"Name[x-test]": "xxFabian Arndtxx"
"Name[x-test]": "xxFabian Arndtxx",
"Name[zh_CN]": "Fabian Arndt"
}
],
"Description": "Use your devices as virtual monitors",