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-10 01:49:18 +00:00
parent b100d75077
commit 87b41a96a9
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

@ -12,6 +12,7 @@
"Name[cs]": "Aleix Pol i Gonzalez", "Name[cs]": "Aleix Pol i Gonzalez",
"Name[de]": "Aleix Pol i Gonzalez", "Name[de]": "Aleix Pol i Gonzalez",
"Name[es]": "Aleix Pol i Gonzalez", "Name[es]": "Aleix Pol i Gonzalez",
"Name[fi]": "Aleix Pol i Gonzalez",
"Name[fr]": "Aleix Pol i Gonzalez", "Name[fr]": "Aleix Pol i Gonzalez",
"Name[it]": "Aleix Pol i Gonzalez", "Name[it]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez", "Name[nl]": "Aleix Pol i Gonzalez",
@ -34,6 +35,7 @@
"Description[ca]": "Useu els vostres dispositius com a monitors virtuals", "Description[ca]": "Useu els vostres dispositius com a monitors virtuals",
"Description[cs]": "Používejte svá zařízení jako virtuální monitory", "Description[cs]": "Používejte svá zařízení jako virtuální monitory",
"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[fr]": "Utilisez vos périphériques comme des écrans virtuels", "Description[fr]": "Utilisez vos périphériques comme des écrans virtuels",
"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",
@ -59,6 +61,7 @@
"Name[ca]": "Monitor virtual", "Name[ca]": "Monitor virtual",
"Name[cs]": "Virtuální monitor", "Name[cs]": "Virtuální monitor",
"Name[es]": "Monitor virtual", "Name[es]": "Monitor virtual",
"Name[fi]": "Virtuaalinäyttö",
"Name[fr]": "Écran virtuel", "Name[fr]": "Écran virtuel",
"Name[id]": "Monitor Virtual", "Name[id]": "Monitor Virtual",
"Name[it]": "Schermo virtuale", "Name[it]": "Schermo virtuale",