From edbea8c3fdb3e7cc2106792c09cfcb48f7da78a2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 29 May 2022 01:44:05 +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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json index b5d4e904e..4dedd5edc 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -4,9 +4,11 @@ { "Email": "aleixpol@kde.org", "Name": "Aleix Pol i Gonzalez", + "Name[ar]": "Aleix Pol i Gonzalez", "Name[az]": "Aleix Pol i Gonzalez", "Name[ca@valencia]": "Aleix Pol i Gonzalez", "Name[ca]": "Aleix Pol i Gonzalez", + "Name[es]": "Aleix Pol i Gonzalez", "Name[nl]": "Aleix Pol i Gonzalez", "Name[sl]": "Aleix Pol i Gonzalez", "Name[sv]": "Aleix Pol i Gonzalez", @@ -16,9 +18,11 @@ } ], "Description": "Use your devices as virtual monitors", + "Description[ar]": "استخدم أجهزتك كشاشات افتراضية", "Description[az]": "Cihazlarınızı virtual monitorlar kimi istifadə edin", "Description[ca@valencia]": "Utiliseu els vostres dispositius com a monitors virtuals", "Description[ca]": "Useu els vostres dispositius com a monitors virtuals", + "Description[es]": "Usar sus dispositivos como monitores virtuales", "Description[nl]": "Uw apparaten als virtuele monitoren gebruiken", "Description[sl]": "Uporabi vaše naprave kot navidezne monitorje", "Description[sv]": "Använd apparater som virtuella bildskärmar", @@ -30,9 +34,11 @@ "Id": "kdeconnect_virtualmonitor", "License": "GPL", "Name": "Virtual Monitor", + "Name[ar]": "شاشة افتراضية", "Name[az]": "Virtual monitor", "Name[ca@valencia]": "Monitor virtual", "Name[ca]": "Monitor virtual", + "Name[es]": "Monitor virtual", "Name[nl]": "Virtuele monitor", "Name[sl]": "Navidezni monitor", "Name[sv]": "Virtuell bildskärm",