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-15 02:55:17 +00:00
parent ead6b1b0ba
commit 5c7a10b587
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/virtualmonitor/kdeconnect_virtualmonitor.json
View file

@ -21,6 +21,7 @@
"Name[nn]": "Aleix Pol i Gonzalez",
"Name[pl]": "Aleix Pol i Gonzalez",
"Name[pt]": "Aleix Pol i Gonzalez",
"Name[pt_BR]": "Aleix Pol i Gonzalez",
"Name[ro]": "Aleix Pol i Gonzalez",
"Name[sl]": "Aleix Pol i Gonzalez",
"Name[sv]": "Aleix Pol i Gonzalez",
@ -47,6 +48,7 @@
"Description[nn]": "Bruk einingane som virtuelle avlyttarar",
"Description[pl]": "Użyj swojego urządzenia jako wyświetlacza wirtualnego",
"Description[pt]": "Usar os seus dispositivos como monitores virtuais",
"Description[pt_BR]": "Usa seus dispositivos como monitores virtuais",
"Description[ro]": "Folosiți-vă dispozitivele ca monitoare virtuale",
"Description[sl]": "Uporabi vaše naprave kot navidezne monitorje",
"Description[sv]": "Använd apparater som virtuella bildskärmar",
@ -75,6 +77,7 @@
"Name[nn]": "Virtuell avlyttar",
"Name[pl]": "Wyświetlacz wirtualny",
"Name[pt]": "Monitor Virtual",
"Name[pt_BR]": "Monitor virtual",
"Name[ro]": "Monitor virtual",
"Name[sl]": "Navidezni monitor",
"Name[sv]": "Virtuell bildskärm",