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-20 01:42:56 +00:00
parent e468759df4
commit 68cdecff16
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

@ -23,6 +23,7 @@
"Name[pt]": "Aleix Pol i Gonzalez", "Name[pt]": "Aleix Pol i Gonzalez",
"Name[pt_BR]": "Aleix Pol i Gonzalez", "Name[pt_BR]": "Aleix Pol i Gonzalez",
"Name[ro]": "Aleix Pol i Gonzalez", "Name[ro]": "Aleix Pol i Gonzalez",
"Name[sk]": "Aleix Pol i Gonzalez",
"Name[sl]": "Aleix Pol i Gonzalez", "Name[sl]": "Aleix Pol i Gonzalez",
"Name[sv]": "Aleix Pol i Gonzalez", "Name[sv]": "Aleix Pol i Gonzalez",
"Name[tr]": "Aleix Pol i Gonzalez", "Name[tr]": "Aleix Pol i Gonzalez",
@ -50,6 +51,7 @@
"Description[pt]": "Usar os seus dispositivos como monitores virtuais", "Description[pt]": "Usar os seus dispositivos como monitores virtuais",
"Description[pt_BR]": "Usa seus dispositivos como monitores virtuais", "Description[pt_BR]": "Usa seus dispositivos como monitores virtuais",
"Description[ro]": "Folosiți-vă dispozitivele ca monitoare virtuale", "Description[ro]": "Folosiți-vă dispozitivele ca monitoare virtuale",
"Description[sk]": "Používajte zariadenia ako virtuálne monitory",
"Description[sl]": "Uporabi vaše naprave kot navidezne monitorje", "Description[sl]": "Uporabi vaše naprave kot navidezne monitorje",
"Description[sv]": "Använd apparater som virtuella bildskärmar", "Description[sv]": "Använd apparater som virtuella bildskärmar",
"Description[tr]": "Aygıtlarınızı sanal ekranlar olarak kullanın", "Description[tr]": "Aygıtlarınızı sanal ekranlar olarak kullanın",
@ -79,6 +81,7 @@
"Name[pt]": "Monitor Virtual", "Name[pt]": "Monitor Virtual",
"Name[pt_BR]": "Monitor virtual", "Name[pt_BR]": "Monitor virtual",
"Name[ro]": "Monitor virtual", "Name[ro]": "Monitor virtual",
"Name[sk]": "Virtuálny Monitor",
"Name[sl]": "Navidezni monitor", "Name[sl]": "Navidezni monitor",
"Name[sv]": "Virtuell bildskärm", "Name[sv]": "Virtuell bildskärm",
"Name[tr]": "Sanal Ekran", "Name[tr]": "Sanal Ekran",