From d78e4e01a4a0ba994c4c2feeb164755e75ca58ba Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 26 Oct 2023 03:24:01 +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 a086cc09e..4eeab533f 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -84,7 +84,7 @@ "Name[ar]": "التحكم الصوتي للشاشة الكبيرة", "Name[az]": "Böyük Ekran səs ilə idarəetmə", "Name[bg]": "Bigscreen управление на гласа", - "Name[ca@valencia]": "Control de veu de Bigscreen", + "Name[ca@valencia]": "Control de veu de la Bigscreen", "Name[ca]": "Control de veu de la Bigscreen", "Name[cs]": "Hlasové ovládání pro Bigscreen", "Name[en_GB]": "Bigscreen voice control",