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-23 01:42:11 +00:00
parent 12180f8d99
commit d497860cd3
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

@ -32,6 +32,7 @@
"Description[fr]": "Utilisez vos périphériques comme des écrans virtuels", "Description[fr]": "Utilisez vos périphériques comme des écrans virtuels",
"Description[it]": "Usa i tuoi dispositivi come schermi virtuali", "Description[it]": "Usa i tuoi dispositivi come schermi virtuali",
"Description[nl]": "Uw apparaten als virtuele monitoren gebruiken", "Description[nl]": "Uw apparaten als virtuele monitoren gebruiken",
"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",
"Description[pt]": "Usar os seus dispositivos como monitores virtuais", "Description[pt]": "Usar os seus dispositivos como monitores virtuais",
"Description[ro]": "Folosiți-vă dispozitivele ca monitoare virtuale", "Description[ro]": "Folosiți-vă dispozitivele ca monitoare virtuale",
@ -53,6 +54,7 @@
"Name[fr]": "Écran virtuel", "Name[fr]": "Écran virtuel",
"Name[it]": "Schermo virtuale", "Name[it]": "Schermo virtuale",
"Name[nl]": "Virtuele monitor", "Name[nl]": "Virtuele monitor",
"Name[nn]": "Virtuell avlyttar",
"Name[pl]": "Wyświetlacz wirtualny", "Name[pl]": "Wyświetlacz wirtualny",
"Name[pt]": "Monitor Virtual", "Name[pt]": "Monitor Virtual",
"Name[ro]": "Monitor virtual", "Name[ro]": "Monitor virtual",