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-09 01:46:21 +00:00
parent 30d7abbb76
commit b100d75077
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

@ -9,6 +9,7 @@
"Name[bg]": "Aleix Pol i Gonzalez", "Name[bg]": "Aleix Pol i Gonzalez",
"Name[ca@valencia]": "Aleix Pol i Gonzalez", "Name[ca@valencia]": "Aleix Pol i Gonzalez",
"Name[ca]": "Aleix Pol i Gonzalez", "Name[ca]": "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[fr]": "Aleix Pol i Gonzalez", "Name[fr]": "Aleix Pol i Gonzalez",
@ -31,6 +32,7 @@
"Description[bg]": "Използвайте устройствата си като виртуални монитори", "Description[bg]": "Използвайте устройствата си като виртуални монитори",
"Description[ca@valencia]": "Utilitzeu els vostres dispositius com a monitors virtuals", "Description[ca@valencia]": "Utilitzeu els vostres dispositius com a monitors virtuals",
"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[es]": "Usar sus dispositivos como monitores virtuales", "Description[es]": "Usar sus dispositivos como monitores virtuales",
"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",
@ -55,6 +57,7 @@
"Name[bg]": "Виртуален монитор", "Name[bg]": "Виртуален монитор",
"Name[ca@valencia]": "Monitor virtual", "Name[ca@valencia]": "Monitor virtual",
"Name[ca]": "Monitor virtual", "Name[ca]": "Monitor virtual",
"Name[cs]": "Virtuální monitor",
"Name[es]": "Monitor virtual", "Name[es]": "Monitor virtual",
"Name[fr]": "Écran virtuel", "Name[fr]": "Écran virtuel",
"Name[id]": "Monitor Virtual", "Name[id]": "Monitor Virtual",