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-03 01:17:38 +00:00
parent 848656cf52
commit 29de4a52bb
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/virtualmonitor/kdeconnect_virtualmonitor.json
View file

@ -55,7 +55,9 @@
"Name[ca@valencia]": "Fabian Arndt", "Name[ca@valencia]": "Fabian Arndt",
"Name[ca]": "Fabian Arndt", "Name[ca]": "Fabian Arndt",
"Name[cs]": "Fabian Arndt", "Name[cs]": "Fabian Arndt",
"Name[en_GB]": "Fabian Arndt",
"Name[eo]": "Fabian Arndt", "Name[eo]": "Fabian Arndt",
"Name[fr]": "Fabian Arndt",
"Name[he]": "פביאן ארנדט", "Name[he]": "פביאן ארנדט",
"Name[hu]": "Fabian Arndt", "Name[hu]": "Fabian Arndt",
"Name[ia]": "Fabian Arndt", "Name[ia]": "Fabian Arndt",
@ -65,7 +67,8 @@
"Name[tr]": "Fabian Arndt", "Name[tr]": "Fabian Arndt",
"Name[uk]": "Fabian Arndt", "Name[uk]": "Fabian Arndt",
"Name[x-test]": "xxFabian Arndtxx", "Name[x-test]": "xxFabian Arndtxx",
"Name[zh_CN]": "Fabian Arndt" "Name[zh_CN]": "Fabian Arndt",
"Name[zh_TW]": "Fabian Arndt"
} }
], ],
"Description": "Use your devices as virtual monitors", "Description": "Use your devices as virtual monitors",