From 46e808e07659cd97ae8ef64313e67a7881801657 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 28 Dec 2023 02:06:08 +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/bigscreen/kdeconnect_bigscreen.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index 7bf337db1..d346cfcaa 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -53,7 +53,7 @@ "Description[ar]": "أرسل أوامر صوتية إلى تلفازك الذي يشغل بلازما الشاشة الكبيرة", "Description[az]": "Plasma Böyük ekranın işlək olduğu televizora səs əmri göndər", "Description[bg]": "Изпращане на гласови команди към телевизора с Bigscreen на Plasma", - "Description[ca@valencia]": "Envieu ordres de veu al TV executant Plasma Bigscreen", + "Description[ca@valencia]": "Envieu ordres de veu al televisor executant Plasma Bigscreen", "Description[ca]": "Envieu ordres de veu al televisor executant el Plasma Bigscreen", "Description[cs]": "Posílejte hlasové příkazy TV, na které běží Plasma Bigscreen", "Description[en_GB]": "Send voice commands to your TV running Plasma Bigscreen",