From b100d750771db5897de29a504f1f6c7864fb22ce Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 9 Jul 2022 01:46:21 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours 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" --- plugins/virtualmonitor/kdeconnect_virtualmonitor.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json index bb0633933..efb9c8a00 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -9,6 +9,7 @@ "Name[bg]": "Aleix Pol i Gonzalez", "Name[ca@valencia]": "Aleix Pol i Gonzalez", "Name[ca]": "Aleix Pol i Gonzalez", + "Name[cs]": "Aleix Pol i Gonzalez", "Name[de]": "Aleix Pol i Gonzalez", "Name[es]": "Aleix Pol i Gonzalez", "Name[fr]": "Aleix Pol i Gonzalez", @@ -31,6 +32,7 @@ "Description[bg]": "Използвайте устройствата си като виртуални монитори", "Description[ca@valencia]": "Utilitzeu 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[fr]": "Utilisez vos périphériques comme des écrans virtuels", "Description[id]": "Gunakan perangkatmu sebagai monitor virtual", @@ -55,6 +57,7 @@ "Name[bg]": "Виртуален монитор", "Name[ca@valencia]": "Monitor virtual", "Name[ca]": "Monitor virtual", + "Name[cs]": "Virtuální monitor", "Name[es]": "Monitor virtual", "Name[fr]": "Écran virtuel", "Name[id]": "Monitor Virtual",