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-29 01:44:05 +00:00
parent 7f3181a86e
commit edbea8c3fd
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/virtualmonitor/kdeconnect_virtualmonitor.json
View file

@ -4,9 +4,11 @@
{
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol i Gonzalez",
"Name[ar]": "Aleix Pol i Gonzalez",
"Name[az]": "Aleix Pol i Gonzalez",
"Name[ca@valencia]": "Aleix Pol i Gonzalez",
"Name[ca]": "Aleix Pol i Gonzalez",
"Name[es]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez",
"Name[sl]": "Aleix Pol i Gonzalez",
"Name[sv]": "Aleix Pol i Gonzalez",
@ -16,9 +18,11 @@
}
],
"Description": "Use your devices as virtual monitors",
"Description[ar]": "استخدم أجهزتك كشاشات افتراضية",
"Description[az]": "Cihazlarınızı virtual monitorlar kimi istifadə edin",
"Description[ca@valencia]": "Utiliseu els vostres dispositius com a monitors virtuals",
"Description[ca]": "Useu els vostres dispositius com a monitors virtuals",
"Description[es]": "Usar sus dispositivos como monitores virtuales",
"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",
@ -30,9 +34,11 @@
"Id": "kdeconnect_virtualmonitor",
"License": "GPL",
"Name": "Virtual Monitor",
"Name[ar]": "شاشة افتراضية",
"Name[az]": "Virtual monitor",
"Name[ca@valencia]": "Monitor virtual",
"Name[ca]": "Monitor virtual",
"Name[es]": "Monitor virtual",
"Name[nl]": "Virtuele monitor",
"Name[sl]": "Navidezni monitor",
"Name[sv]": "Virtuell bildskärm",