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-05-27 01:42:01 +00:00
parent 748ae772d4
commit baded216a5
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/virtualmonitor/kdeconnect_virtualmonitor.json
View file

@ -4,16 +4,22 @@
{ {
"Email": "aleixpol@kde.org", "Email": "aleixpol@kde.org",
"Name": "Aleix Pol i Gonzalez", "Name": "Aleix Pol i Gonzalez",
"Name[az]": "Aleix Pol i Gonzalez",
"Name[ca]": "Aleix Pol i Gonzalez", "Name[ca]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez", "Name[nl]": "Aleix Pol i Gonzalez",
"Name[sl]": "Aleix Pol i Gonzalez",
"Name[sv]": "Aleix Pol i Gonzalez",
"Name[tr]": "Aleix Pol i Gonzalez", "Name[tr]": "Aleix Pol i Gonzalez",
"Name[uk]": "Aleix Pol i Gonzalez", "Name[uk]": "Aleix Pol i Gonzalez",
"Name[x-test]": "xxAleix Pol i Gonzalezxx" "Name[x-test]": "xxAleix Pol i Gonzalezxx"
} }
], ],
"Description": "Use your devices as virtual monitors", "Description": "Use your devices as virtual monitors",
"Description[az]": "Cihazlarınızı virtual monitorlar kimi istifadə edin",
"Description[ca]": "Useu els vostres dispositius com a monitors virtuals", "Description[ca]": "Useu els vostres dispositius com a monitors virtuals",
"Description[nl]": "Uw apparaten als virtuele monitoren gebruiken", "Description[nl]": "Uw apparaten als virtuele monitoren gebruiken",
"Description[sl]": "Uporabi vaše naprave kot navidezne monitorje",
"Description[sv]": "Använd apparater som virtuella bildskärmar",
"Description[tr]": "Aygıtlarınızı sanal ekranlar olarak kullanın", "Description[tr]": "Aygıtlarınızı sanal ekranlar olarak kullanın",
"Description[uk]": "Використання ваших пристроїв як віртуальних моніторів", "Description[uk]": "Використання ваших пристроїв як віртуальних моніторів",
"Description[x-test]": "xxUse your devices as virtual monitorsxx", "Description[x-test]": "xxUse your devices as virtual monitorsxx",
@ -22,8 +28,11 @@
"Id": "kdeconnect_virtualmonitor", "Id": "kdeconnect_virtualmonitor",
"License": "GPL", "License": "GPL",
"Name": "Virtual Monitor", "Name": "Virtual Monitor",
"Name[az]": "Virtual monitor",
"Name[ca]": "Monitor virtual", "Name[ca]": "Monitor virtual",
"Name[nl]": "Virtuele monitor", "Name[nl]": "Virtuele monitor",
"Name[sl]": "Navidezni monitor",
"Name[sv]": "Virtuell bildskärm",
"Name[tr]": "Sanal Ekran", "Name[tr]": "Sanal Ekran",
"Name[uk]": "Віртуальний монітор", "Name[uk]": "Віртуальний монітор",
"Name[x-test]": "xxVirtual Monitorxx", "Name[x-test]": "xxVirtual Monitorxx",