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-14 02:56:54 +00:00
parent 58840eb970
commit ead6b1b0ba
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

@ -14,7 +14,9 @@
"Name[es]": "Aleix Pol i Gonzalez", "Name[es]": "Aleix Pol i Gonzalez",
"Name[fi]": "Aleix Pol i Gonzalez", "Name[fi]": "Aleix Pol i Gonzalez",
"Name[fr]": "Aleix Pol i Gonzalez", "Name[fr]": "Aleix Pol i Gonzalez",
"Name[ia]": "Aleix Pol i Gonzalez",
"Name[it]": "Aleix Pol i Gonzalez", "Name[it]": "Aleix Pol i Gonzalez",
"Name[ko]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez", "Name[nl]": "Aleix Pol i Gonzalez",
"Name[nn]": "Aleix Pol i Gonzalez", "Name[nn]": "Aleix Pol i Gonzalez",
"Name[pl]": "Aleix Pol i Gonzalez", "Name[pl]": "Aleix Pol i Gonzalez",
@ -37,8 +39,10 @@
"Description[es]": "Usar sus dispositivos como monitores virtuales", "Description[es]": "Usar sus dispositivos como monitores virtuales",
"Description[fi]": "Käytä laitteita virtuaalinäyttöinä", "Description[fi]": "Käytä laitteita virtuaalinäyttöinä",
"Description[fr]": "Utilisez vos périphériques comme des écrans virtuels", "Description[fr]": "Utilisez vos périphériques comme des écrans virtuels",
"Description[ia]": "Usa tu dispositivos como monitor virtual",
"Description[id]": "Gunakan perangkatmu sebagai monitor virtual", "Description[id]": "Gunakan perangkatmu sebagai monitor virtual",
"Description[it]": "Usa i tuoi dispositivi come schermi virtuali", "Description[it]": "Usa i tuoi dispositivi come schermi virtuali",
"Description[ko]": "내 장치를 가상 모니터로 사용",
"Description[nl]": "Uw apparaten als virtuele monitoren gebruiken", "Description[nl]": "Uw apparaten als virtuele monitoren gebruiken",
"Description[nn]": "Bruk einingane som virtuelle avlyttarar", "Description[nn]": "Bruk einingane som virtuelle avlyttarar",
"Description[pl]": "Użyj swojego urządzenia jako wyświetlacza wirtualnego", "Description[pl]": "Użyj swojego urządzenia jako wyświetlacza wirtualnego",
@ -63,8 +67,10 @@
"Name[es]": "Monitor virtual", "Name[es]": "Monitor virtual",
"Name[fi]": "Virtuaalinäyttö", "Name[fi]": "Virtuaalinäyttö",
"Name[fr]": "Écran virtuel", "Name[fr]": "Écran virtuel",
"Name[ia]": "Monitor virtual",
"Name[id]": "Monitor Virtual", "Name[id]": "Monitor Virtual",
"Name[it]": "Schermo virtuale", "Name[it]": "Schermo virtuale",
"Name[ko]": "가상 모니터",
"Name[nl]": "Virtuele monitor", "Name[nl]": "Virtuele monitor",
"Name[nn]": "Virtuell avlyttar", "Name[nn]": "Virtuell avlyttar",
"Name[pl]": "Wyświetlacz wirtualny", "Name[pl]": "Wyświetlacz wirtualny",