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-06-05 01:42:52 +00:00
parent 9b26dadd5c
commit 96583a62c2
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

@ -9,8 +9,10 @@
"Name[ca@valencia]": "Aleix Pol i Gonzalez",
"Name[ca]": "Aleix Pol i Gonzalez",
"Name[es]": "Aleix Pol i Gonzalez",
"Name[fr]": "Aleix Pol i Gonzalez",
"Name[it]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez",
"Name[pl]": "Aleix Pol i Gonzalez",
"Name[pt]": "Aleix Pol i Gonzalez",
"Name[ro]": "Aleix Pol i Gonzalez",
"Name[sl]": "Aleix Pol i Gonzalez",
@ -26,8 +28,10 @@
"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[fr]": "Utilisez vos périphériques comme des écrans virtuels",
"Description[it]": "Usa i tuoi dispositivi come schermi virtuali",
"Description[nl]": "Uw apparaten als virtuele monitoren gebruiken",
"Description[pl]": "Użyj swojego urządzenia jako wyświetlacza wirtualnego",
"Description[pt]": "Usar os seus dispositivos como monitores virtuais",
"Description[ro]": "Folosiți-vă dispozitivele ca monitoare virtuale",
"Description[sl]": "Uporabi vaše naprave kot navidezne monitorje",
@ -45,8 +49,10 @@
"Name[ca@valencia]": "Monitor virtual",
"Name[ca]": "Monitor virtual",
"Name[es]": "Monitor virtual",
"Name[fr]": "Écran virtuel",
"Name[it]": "Schermo virtuale",
"Name[nl]": "Virtuele monitor",
"Name[pl]": "Wyświetlacz wirtualny",
"Name[pt]": "Monitor Virtual",
"Name[ro]": "Monitor virtual",
"Name[sl]": "Navidezni monitor",