From c4f098876a257dabfa8159e80b08fd548dc93894 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 23 Jul 2022 02:52:24 +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 9a09a5c24..2b00075ed 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -11,6 +11,7 @@ "Name[ca]": "Aleix Pol i Gonzalez", "Name[cs]": "Aleix Pol i Gonzalez", "Name[de]": "Aleix Pol i Gonzalez", + "Name[en_GB]": "Aleix Pol i Gonzalez", "Name[es]": "Aleix Pol i Gonzalez", "Name[fi]": "Aleix Pol i Gonzalez", "Name[fr]": "Aleix Pol i Gonzalez", @@ -38,6 +39,7 @@ "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[en_GB]": "Use your devices as virtual monitors", "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", @@ -68,6 +70,7 @@ "Name[ca@valencia]": "Monitor virtual", "Name[ca]": "Monitor virtual", "Name[cs]": "Virtuální monitor", + "Name[en_GB]": "Virtual Monitor", "Name[es]": "Monitor virtual", "Name[fi]": "Virtuaalinäyttö", "Name[fr]": "Écran virtuel",