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 2022-07-24 02:46:46 +00:00
parent c4f098876a
commit 1671ab99a1
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/virtualmonitor/kdeconnect_virtualmonitor.json
View file

@ -39,6 +39,7 @@
"Description[ca@valencia]": "Utilitzeu els vostres dispositius com a monitors virtuals",
"Description[ca]": "Useu els vostres dispositius com a monitors virtuals",
"Description[cs]": "Používejte svá zařízení jako virtuální monitory",
"Description[de]": "Verwenden Sie Ihre Geräte als virtuelle Monitore",
"Description[en_GB]": "Use your devices as virtual monitors",
"Description[es]": "Usar sus dispositivos como monitores virtuales",
"Description[fi]": "Käytä laitteita virtuaalinäyttöinä",
@ -70,6 +71,7 @@
"Name[ca@valencia]": "Monitor virtual",
"Name[ca]": "Monitor virtual",
"Name[cs]": "Virtuální monitor",
"Name[de]": "Virtueller Monitor",
"Name[en_GB]": "Virtual Monitor",
"Name[es]": "Monitor virtual",
"Name[fi]": "Virtuaalinäyttö",